diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index 015864a6f969f6a00f942874dc1a14b62cebc483..ff0d914815d21e79221efd0ce5ff89845759233d 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -743,7 +743,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         
@@ -758,7 +758,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       
@@ -771,11 +771,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          
@@ -788,9 +786,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+            - IS_EQUAL_TO
         contextValueRange:
-          type: array
-          items:
-            $ref: 'TS28541_SliceNrm.yaml#/components/schemas/SharingLevel'
+          $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel"
    #-------Definition of the concrete ExpectionContext dataType----------------#