diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index f641734f3ff2ecf2c4e40da15d24da66f88f247d..40f9f89095b244aca63a4b2fcd01adc6327d07fb 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -447,9 +447,7 @@ components:
         contextValueRange:
           type: array
           items:
-            $ref: "#/components/schemas/CoverageArea"
-    CoverageArea:
-      type: string
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
     CoverageTACContext:
       description: >-
         This data type is the "ObjectContext" data type with specialisations for CoverageTACContext     
@@ -466,7 +464,7 @@ components:
         contextValueRange:
           type: array
           items:
-            $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac"
+            $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac"
     PLMNContext:
       description: >-
         This data type is the "ObjectContext" data type with specialisations for PLMNContext       
@@ -536,9 +534,7 @@ components:
           enum:
             - IS_EQUAL_TO
         contextValueRange:
-          type: array
-          items:
-            type: string
+          type: string
     EdgeIdentificationLocContext:
       description: >-
         This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationLocContext    
@@ -553,9 +549,7 @@ components:
           enum:
             - IS_EQUAL_TO
         contextValueRange:
-          type: array
-          items:
-            type: string
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'            
     CoverageAreaTAContext:
       description: >-
         This data type is the "ObjectContext" data type with specialisations for CoverageAreaTAContext       
@@ -570,11 +564,7 @@ components:
           enum:
             - IS_ALL_OF
         contextValueRange:
-          type: array
-          items:
-            $ref: "#/components/schemas/CoverageAreaTAList"
-    CoverageAreaTAList:
-          type: integer
+          $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac" 
    #-------Definition of the scenario specific  ObjectTarget dataType----------------#
    
    #-------Definition of the concrete ExpectationContext dataType----------------#