diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index 40f94c033129e69869da9b6e13ffdf14d198fccb..8433a62fc5294bd87f66461cfc745ddb97f16119 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -166,7 +166,8 @@ components:
               - $ref: '#/components/schemas/CoverageAreaPolygonContext'
               - $ref: '#/components/schemas/CoverageTACContext'
               - $ref: '#/components/schemas/PLMNContext'
-              - $ref: '#/components/schemas/NRFqBandContext'
+              - $ref: '#/components/schemas/DlFrequencyContext'
+              - $ref: '#/components/schemas/UlFrequencyContext'              
               - $ref: '#/components/schemas/RATContext'
               - $ref: "#/components/schemas/UEGroupContext"
               - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'                                
@@ -737,15 +738,17 @@ components:
           type: array
           items:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
-    NRFqBandContext:
+    DlFrequencyContext:
       description: >-
-        This data type is the "ObjectContext" data type with specialisations for NRFqBandContext       
+        This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext".
+        It describes the downlink frequency information (RF reference frequencies and/ or the 
+        frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied.       
       type: object
       properties:
         contextAttribute:
           type: string
           enum:
-            - NRFqBand
+            - DlFrequency
         contextCondition:
           type: string
           enum:
@@ -753,7 +756,26 @@ components:
         contextValueRange:
           type: array
           items:
-            type: string
+            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency'
+    UlFrequencyContext:
+      description: >-
+        This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext".
+        It describes the uplink frequency information (RF reference frequencies and/ or the frequency 
+        operating band) supported by the RAN SubNetwork that the intent expectation is applied.       
+      type: object
+      properties:
+        contextAttribute:
+          type: string
+          enum:
+            - UlFrequency
+        contextCondition:
+          type: string
+          enum:
+            - IS_ALL_OF
+        contextValueRange:
+          type: array
+          items:
+            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency'            
     RATContext:
       description: >-
         This data type is the "ObjectContext" data type with specialisations for RATContext           
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index 55eae961738431e32fdfac845c0a17561b074e41..d53c4192ed5260bb3d77fcf00d86fbd5710d246f 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -201,7 +201,24 @@ components:
       enum:
           - DELIVER
           - ENSURE
-    ValueRangeType:
+    Frequency:
+      description: >-
+        It desribes the RF reference frequency (i.e. Absolute Radio Frequency Channel Number) 
+        and/or the frequency operating band used for a given direction (UL or DL) in FDD or 
+        for both UL and DL directions in TDD.      
+      type: object 
+      properties:
+        arfcn:
+          type: integer
+          description: >- 
+            This attribute shall be supported, when the frequency information represent RF reference frequency.
+            The allowed values for NR see TS 38.104 subclause 5.4.2.1; The allowed values for EUTRAN see TS 36.104 [X] subclause 5.7.3; 
+        freqband:
+          type: string
+          description: >-
+            This attribute shall be supported, when the frequency information represent frequency operating band. 
+            The allowed values for NR see TS 38.104 subclause 5.4.2.3; The allowed value for EUTRAN see TS 36.104 subclause 5.7.3       
+    ValueRangeType: 
       oneOf:
         - type: number
         - type: string
@@ -212,6 +229,7 @@ components:
         - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
         - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'
+        - $ref: '#/components/schemas/Frequency'        
    #-------Definition of the generic dataType --------------#    
 
    #-------Definition of the generic IntentContext dataType --------------#