diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index 1b67b2e68440034fd00aed6bd6234725181d8d83..cd9f51cb43d50256112c95024386eb9594d6a21b 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -135,6 +135,17 @@ components:
       - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
       - type: object
         properties:
+          intentHandlingScope:
+            type: array
+            uniqueItems: true
+            items: 
+              $ref: '#/components/schemas/IntentHandlingScope'
+          supportedNegotiationFunctionalities:
+            type: array
+            uniqueItems: true
+            minimum: 1
+            items: 
+              $ref: '#/components/schemas/NegotiationFunctionality'              
           intentHandlingCapabilityList:
             type: array
             uniqueItems: true
@@ -369,12 +380,23 @@ components:
           maximum: 255
         sNssai: 
           $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
-        UEType:
-          description: It describes the information of a UE Type defined in TS 38.331
-          type: string
-          enum: 
-            - REDCAP_UE
-            - EREDCAP_UE
+    IntentHandlingScope:
+      type: string
+      enum: 
+        - RAN
+        - CN     
+    NegotiationFunctionality:
+      type: string
+      enum:
+        - FEASIBILITY_CHECK
+        - EXPLORATION
+        - FULFILMENT_WITH_NEGOTIATION 
+    UEType:
+      description: It describes the information of a UE Type defined in TS 38.331
+      type: string
+      enum: 
+        - REDCAP_UE
+        - EREDCAP_UE
     CivicArea:
       description: >-
         It describes civic area, which is represented by civic address (e.g. streets, districts, seats, etc.) or 
@@ -948,6 +970,7 @@ components:
           type: string
           readOnly: true
         supportedExpectationObjectType:
+          description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer.
           type: string
           enum: 
             - RAN_SUBNETWORK
@@ -955,13 +978,24 @@ components:
             - 5GC_SUBNETWORK 
             - RADIO_SERVICE
           readOnly: true  
-          description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer.            
+        supportedObjectContextInfoList:
+          type: array
+          items:
+             $ref: '#/components/schemas/SupportedContextInfo'
+          uniqueItems: true
+          minItems: 1
         supportedExpectationTargetInfoList:
           type: array
           items:
             $ref: '#/components/schemas/SupportedExpectationTargetInfo'
           uniqueItems: true
           minItems: 1
+        supportedExpectationContextInfoList:
+          type: array
+          items:
+             $ref: '#/components/schemas/SupportedContextInfo'
+          uniqueItems: true
+          minItems: 1   
       required:
         - intentHandlingCapabilityId
         - supportedExpectationObjectType
@@ -986,6 +1020,23 @@ components:
             - $ref: '#/components/schemas/ValueRangeType'
       required:
         - supportedTargetName
+
+    SupportedContextInfo:
+      type: object
+      properties: 
+        supportedContextAttribute:
+          type: string
+        supportedContextCondition:
+          $ref: '#/components/schemas/Condition'
+        supportedContextValueRange:
+          oneOf:
+            - type: array
+              uniqueItems: true
+              minItems: 1
+              items:
+                $ref: '#/components/schemas/ValueRangeType'
+            - $ref: '#/components/schemas/ValueRangeType'
+
    #-------Definition of the concrete IntentHandlingCapability dataType----------------#