diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index e1d2bb5f6574691fd3f3a8ff407671cf7fd4ffd6..14920955e69b3184c80f8dfc8e1afdb0672cdb21 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -75,12 +75,16 @@ components:
               - $ref: '#/components/schemas/ULLatencyTarget'
               - $ref: '#/components/schemas/DLThptPerUETarget'
               - $ref: '#/components/schemas/ULThptPerUETarget'
+              - $ref: '#/components/schemas/NumberofUEsTarget'
               - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
         expectationContexts:
           type: array
           uniqueItems: true
           items:
-            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
+            type: object
+            oneOf:
+              - $ref: '#/components/schemas/SchedulingTimeContext'
+              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
       required:
         - expectationId                   
     EdgeServiceSupportExpectation:
@@ -204,6 +208,7 @@ components:
             oneOf:
               - $ref: '#/components/schemas/CoverageAreaPolygonContext'
               - $ref: '#/components/schemas/ServiceTypeContext'
+              - $ref: '#/components/schemas/PlmnInfoContext'
               - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
     EdgeServiceSupportExpectationObject: 
       description: >-
@@ -594,6 +599,22 @@ components:
             - IS_GREATER_THAN
         targetValueRange:
           type: integer
+    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.
+      type: object
+      properties:
+        targetName:
+          type: string
+          enum:
+            - NumberofUEs
+        targetCondition:
+          type: string
+          enum:
+            - IS_LESS_THAN
+        targetValueRange:
+          type: integer
     DLThptPerUETarget:
       description: >-
         This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget. It describes the DL throughput target by the per UE for the 
@@ -1160,6 +1181,40 @@ components:
             - IS_EQUAL_TO
         contextValueRange:
           $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.
+      type: object
+      properties:
+        contextAttribute:
+          type: string
+          enum:
+            - PlmnInfo
+        contextCondition:
+          type: string
+          enum:
+            - IS_ALL_OF
+        contextValueRange:
+          $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.
+      type: object
+      properties:
+        contextAttribute:
+          type: string
+          enum:
+            - schedulingTime
+        contextCondition:
+          type: string
+          enum:
+            - IS_ALL_OF
+        contextValueRange:
+          $ref: "TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime"
     StartTimeContext:
       description: >-
         This data type is the "ExpectationContext" data type with specialisations for StartTimeContext       
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index 248eac3dc1ef7cc975ca89c7a8796e83a58ca06e..bc8d92cca90f827084476fe8d946321bc4909611 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -266,7 +266,9 @@ components:
         - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'
         - $ref: '#/components/schemas/UEGroup'
-        - $ref: '#/components/schemas/Frequency'                  
+        - $ref: '#/components/schemas/Frequency'
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'
+        - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo'
     UEGroup:
       description: >-
         It describes the UE Group, which is