diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index 974b8f4ba8bbb3b48f58c6346d2a8f27b8a2bb52..576c3bdc1a77ee8f45502cb1fe45b83ba18a51f2 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -592,7 +592,7 @@ components:
           enum:
             - IS_EQUAL_TO
         contextValueRange:
-          type: string
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
     ServiceEndTimeContext:
       description: >-
         This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext         
@@ -607,7 +607,7 @@ components:
           enum:
             - IS_EQUAL_TO
         contextValueRange:
-          type: string
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
     UEMobilityLevelContext:
       description: >-
         This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext       
@@ -620,11 +620,9 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+            - IS_EQUAL_TO
         contextValueRange:
-          type: array
-          items:
-            $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel"
+          $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel"
     ResourceSharingLevelContext:
       description: >-
         This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext          
@@ -637,9 +635,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+            - IS_EQUAL_TO
         contextValueRange:
-          type: array
-          items:
-            $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel"
-   #-------Definition of the concrete ExpectationContext dataType----------------#
+          $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel"
+   #-------Definition of the concrete ExpectionContext dataType----------------#