diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index 7e969e4e98897e1d3a8d382e83919a243eab4fb3..015864a6f969f6a00f942874dc1a14b62cebc483 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -109,7 +109,7 @@ components:
               - $ref: '#/components/schemas/PLMNContext'
               - $ref: '#/components/schemas/NRFqBandContext'
               - $ref: '#/components/schemas/RATContext'
-              - $ref: '#/components/schemas/ObjectContext'
+              - $ref: "#/components/schemas/UEGroupContext"
               - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'                                
     ServiceSupportExpectationObject: 
       description: >-
@@ -127,7 +127,7 @@ components:
           items:
             type: object
             oneOf:
-              - $ref: '#/components/schemas/EdgeIdentificationIdContext'
+              - $ref: '#/components/schemas/EdgeIdenfiticationIdContext'
               - $ref: '#/components/schemas/EdgeIdentificationLocContext'
               - $ref: '#/components/schemas/CoverageAreaTAContext'   
               - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'               
@@ -649,7 +649,31 @@ components:
               - UTRAN
               - EUTRAN
               - NR
-    EdgeIdentificationIdContext:
+    UEGroupContext:
+      description: >-
+        This data type is the "ObjectContext" data type with specialisations for UEGroup([5QI, SNSSAI])
+      type: object
+      properties:
+        contextAttribute:
+          type: string
+          enum:
+            - UEGroup
+        contextCondition:
+          type: string
+          enum:
+            - IS_ALL_OF
+        contextValueRange:
+          type: array
+          items:
+            $ref: "#/components/schemas/UEGroup"            
+    UEGroup:
+      type: object
+      properties:
+        fiveQI:
+          type: integer
+        sNssai:
+          $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'  
+    EdgeIdenfiticationIdContext:
       description: >-
         This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationIdContext      
       type: object