diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index 14920955e69b3184c80f8dfc8e1afdb0672cdb21..b0021fc5c15a4503ac4ef9c76fb7c21ce0609bc2 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -42,7 +42,8 @@ components:
               - $ref: '#/components/schemas/AveULPrbLoadTarget'
               - $ref: '#/components/schemas/AveDLPrbLoadTarget'
               - $ref: "#/components/schemas/RANEnergyConsumptionTarget"
-              - $ref: "#/components/schemas/RANEnergyEfficiencyTarget"               
+              - $ref: "#/components/schemas/RANEnergyEfficiencyTarget"
+              - $ref: "#/components/schemas/ActiveUEsNumTarget"                             
               - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
         expectationContexts:
           type: array
@@ -51,6 +52,7 @@ components:
             type: object
             oneOf:
              - $ref: '#/components/schemas/TargetAssuranceTimeContext'
+             - $ref: '#/components/schemas/SchedulingTimeContext'             
              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
       required:
         - expectationId
@@ -183,6 +185,7 @@ components:
             oneOf:
               - $ref: '#/components/schemas/CoverageAreaPolygonContext'
               - $ref: '#/components/schemas/CoverageTACContext'
+              - $ref: '#/components/schemas/CellContext'              
               - $ref: '#/components/schemas/PLMNContext'
               - $ref: '#/components/schemas/DlFrequencyContext'
               - $ref: '#/components/schemas/UlFrequencyContext'              
@@ -599,15 +602,34 @@ components:
             - IS_GREATER_THAN
         targetValueRange:
           type: integer
-    NumberofUEsTarget:
+    ActiveUEsNumTarget:
       description: >-
-        This data type is the "ExpectationTarget" data type with specialisations for NumberofUEsTarget.It describes 
-        the number of UEs target for the Radio Service that the intent expectation is applied.
+        This data type is the "ExpectationTarget" data type with specialisations for ActiveUEsNumTarget.
+        It describes the number of Active UEs for the specified areas. This target is related to Mean
+        number of Active UEs in the DL per cell and Mean number of Active UEs in the UL per cell defined
+        in 3GPP TS 28.552 [6].
       type: object
       properties:
         targetName:
           type: string
           enum:
+            - ActiveUEsNum
+        targetCondition:
+          type: string
+          enum:
+            - IS_WITHIN_RANGE
+        targetValueRange:
+          type: array
+          description: >- 
+           a pair of integer values to represent minimum number of active UEs and maximum number of active UEs.
+          items:
+            type: integer
+            minItems: 1
+            maxItems: 2
+    NumberofUEsTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for NumberofUEsTarget.It describes 
+        the number of UEs target for the Radio Service that the intent expectation is applied.
             - NumberofUEs
         targetCondition:
           type: string
@@ -849,6 +871,30 @@ components:
           uniqueItems: true
           items:
             $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac"
+    CellContext:
+      description: >-
+        This data type is the "ObjectContext" data type with specialisations for CellContext.
+        It describes the coverage areas for the RAN SubNetwork that the intent expectation is applied
+        in the form of a list of cells (including E-UTRAN cells identified by E-UTRAN-CGI and NR cells
+        identified by NG-RAN CGI).
+      type: object
+      properties:
+        contextAttribute:
+          type: string
+          enum:
+            - Cell
+        contextCondition:
+          type: string
+          enum:
+             - IS_ALL_OF
+        contextValueRange:
+          type: array
+          items:
+            $ref: "#/components/schemas/CellId"
+    CellId:
+      oneOf:
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/EutraCellId'
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NrCellId'
     PLMNContext:
       description: >-
         This data type is the "ObjectContext" data type with specialisations for PLMNContext       
@@ -1183,9 +1229,7 @@ components:
           $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst"
     PlmnInfoContext:
       description: >-
-        This data type is the "ExpectationContext" data type with specialisations for PlmnInfoContext.It describes 
-        the PLMN supported by the Radio Service that the intent expectation is applied. In case of network slicing 
-        feature is supported, this also represents the S-NSSAI in the PLMN supported by the Radio Service.
+        This data type is the "ExpectationContext" data type with specialisations for PlmnInfoContext.It describes the PLMN supported by the Radio Service that the intent expectation is applied. In case of network slicing feature is supported, this also represents the S-NSSAI in the PLMN supported by the Radio Service.
       type: object
       properties:
         contextAttribute:
@@ -1200,9 +1244,7 @@ components:
           $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnInfo"
     SchedulingTimeContext:
       description: >-
-        This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes
-        the scheduled times (including one-time interval, daily periodicity, weekly periodicity or monthly periodicity)
-        for the IntentObject that the intent expectation is applied.
+        This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes the scheduled times (including one-time interval, daily periodicity, weekly periodicity or monthly periodicity) for the IntentObject that the intent expectation is applied.
       type: object
       properties:
         contextAttribute: