diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index 8433a62fc5294bd87f66461cfc745ddb97f16119..8ef2e9ad0f917142a14172cae823157c772583b5 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -813,14 +813,7 @@ components:
         contextValueRange:
           type: array
           items:
-            $ref: "#/components/schemas/UEGroup"            
-    UEGroup:
-      type: object
-      properties:
-        fiveQI:
-          type: integer
-        sNssai:
-          $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'  
+            $ref: "TS28312_IntentNrm.yaml#/components/schemas/UEGroup"              
     EdgeIdenfiticationIdContext:
       description: >-
         This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationIdContext      
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index d53c4192ed5260bb3d77fcf00d86fbd5710d246f..70146c832124e9b397a23fb422ea4f0aba23597d 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -229,7 +229,21 @@ components:
         - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
         - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'
-        - $ref: '#/components/schemas/Frequency'        
+        - $ref: '#/components/schemas/UEGroup'
+        - $ref: '#/components/schemas/Frequency'                  
+    UEGroup:
+      description: >-
+        It describes the UE Group, which is 
+        represented by specific 5QI, specific S-NSSAI, or a specific combination 
+        of S-NSSAI and 5QI
+      type: object
+      properties:
+        fiveQI:
+          type: integer
+          minimum: 0
+          maximum: 255  
+        sNssai: 
+          $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'                      
    #-------Definition of the generic dataType --------------#    
 
    #-------Definition of the generic IntentContext dataType --------------#