diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index b86d911edca71f38767bb6f8a623fba9dfd0ef4f..40f94c033129e69869da9b6e13ffdf14d198fccb 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -702,11 +702,7 @@ components:
           enum:
             - IS_ALL_OF
         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     
@@ -723,7 +719,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       
@@ -817,9 +813,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    
@@ -834,9 +828,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       
@@ -853,9 +845,7 @@ components:
         contextValueRange:
           type: array
           items:
-            $ref: '#/components/schemas/CoverageAreaTAList'
-    CoverageAreaTAList:
-          type: integer
+            $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac"
     NfTypeContext:          
       description: >-
         This data type is the "ObjectContext" data type with specialisations for NfTypeContext