diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index 38e3febf1faf93d41a67bb9a11e54ebb76d70ef7..55eae961738431e32fdfac845c0a17561b074e41 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -47,6 +47,8 @@ components:
                 - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation"  
                 - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation"              
                 - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation"                
+          contextSelectivity:
+            $ref: "#/components/schemas/Selectivity" 
           intentContexts:
             type: array
             items:
@@ -111,6 +113,8 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/ExpectationTarget'
+        contextSelectivity:
+          $ref: "#/components/schemas/Selectivity"
         expectationContexts:
           type: array
           items:
@@ -133,6 +137,8 @@ components:
             - 5GC_SubNetwork  #value for 5GC Network Expectation--#
         objectInstance:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+        contextSelectivity:
+          $ref: "#/components/schemas/Selectivity"
         objectContexts:
           type: array
           items:
@@ -154,6 +160,12 @@ components:
         - IS_EQUAL_TO_OR_LESS_THAN
         - IS_EQUAL_TO_OR_GREATER_THAN
         - IS_ALL_OF        
+    Selectivity:
+      type: string
+      enum:
+        - ALL_OF
+        - ONE_OF
+        - ANY_OF
     FulfilStatus:
       type: string
       readOnly: true      
@@ -231,11 +243,13 @@ components:
         targetCondition:
           $ref: '#/components/schemas/Condition'
         targetValueRange:
-            oneOf:
-              - type: array
-                items:
-                  $ref: "#/components/schemas/ValueRangeType"
-              - $ref: "#/components/schemas/ValueRangeType"
+          oneOf:
+            - type: array
+              items:
+                $ref: "#/components/schemas/ValueRangeType"
+            - $ref: "#/components/schemas/ValueRangeType"
+        contextSelectivity:
+          $ref: "#/components/schemas/Selectivity"
         targetContexts:
           type: array
           items: