diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index e66f20dd0dad610fc4096d396acf438a3b11838d..c918933b5d6f83b2bf839dd7e8819fb733d760a9 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -186,6 +186,17 @@ components:
       enum:
           - DELIVER
           - ENSURE
+    ValueRangeType:
+      oneOf:
+        - type: number
+        - type: string
+        - type: boolean
+        - type: integer
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
+        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate '
    #-------Definition of the generic dataType --------------#    
 
    #-------Definition of the generic IntentContext dataType --------------#    
@@ -199,9 +210,11 @@ components:
         contextCondition:
           $ref: '#/components/schemas/Condition'
         contextValueRange:
-          type: array
-          items:
-            type: number 
+            oneOf:
+              - type: array
+                items:
+                  $ref: "#/components/schemas/ValueRangeType"
+              - $ref: "#/components/schemas/ValueRangeType"
    #-------Definition of the generic IntentContext dataType --------------#   
    
    #-------Definition of the generic ExpectationTarget dataType----------#     
@@ -215,7 +228,11 @@ components:
         targetCondition:
           $ref: '#/components/schemas/Condition'
         targetValueRange:
-          type: number
+            oneOf:
+              - type: array
+                items:
+                  $ref: "#/components/schemas/ValueRangeType"
+              - $ref: "#/components/schemas/ValueRangeType"
         targetContexts:
           type: array
           items:
@@ -230,7 +247,11 @@ components:
         contextCondition:
           $ref: '#/components/schemas/Condition'
         contextValueRange:
-          type: number        
+            oneOf:
+              - type: array
+                items:
+                  $ref: "#/components/schemas/ValueRangeType"
+              - $ref: "#/components/schemas/ValueRangeType"      
    #-------Definition of the generic ExpectationTarget  dataType----------#  
    
    #-------Definition of the generic ObjectContext dataType----------------#
@@ -244,9 +265,11 @@ components:
         contextCondition:
           $ref: '#/components/schemas/Condition'
         contextValueRange:
-          type: array
-          items:
-            type: number 
+            oneOf:
+              - type: array
+                items:
+                  $ref: "#/components/schemas/ValueRangeType"
+              - $ref: "#/components/schemas/ValueRangeType" 
    #-------Definition of the generic ObjectContext dataType----------------#
 
    #-------Definition of the generic ExpectionContext dataType----------------#
@@ -260,9 +283,11 @@ components:
         contextCondition:
           $ref: '#/components/schemas/Condition'
         contextValueRange:
-          type: array
-          items:
-            type: number 
+            oneOf:
+              - type: array
+                items:
+                  $ref: "#/components/schemas/ValueRangeType"
+              - $ref: "#/components/schemas/ValueRangeType" 
    #-------Definition of the concrete ExpectionContext dataType----------------#
    #-------Definition of the generic IntentFulfilmentReport dataType----------------#
     IntentFulfilmentReport: