diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index 3d018cb18699e9e39f4220c58e9f6ac3c4e9f368..81fc68b3a1163068846f03b0cce7db632cea2221 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -411,8 +411,12 @@ components:
               - FEASIBLE
               - INFEASIBLE
         infeasibilityReason:
+          description: An attribute which is used when feasibilityCheckResult is INFEASIBLE 
           type: string
-          description: An attribute which is used when feasibilityCheckResult is INFEASIBLE          
+          readOnly: true      
+          enum:
+             - INVALID_INTENT_EXPRESSION
+             - INTENT_CONFLICT
    #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------#
 
    #-------Definition of the generic IntentHandlingCapability dataType----------------#
diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml
index 116dfc4b7d44bcd8df8eafb2f94fadb728a982fa..797d7ca86f788e7cff8d0194fd28cc2e8848bf49 100755
--- a/OpenAPI/TS28532_ProvMnS.yaml
+++ b/OpenAPI/TS28532_ProvMnS.yaml
@@ -219,7 +219,7 @@ paths:
             are targeted.
           required: false
           schema:
-            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter'
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions'
         - name: attributes
           in: query
           description: >-
@@ -251,7 +251,10 @@ paths:
             select data nodes.
           required: false
           schema:
-            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter'
+            oneOf:
+              - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic'
+              - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced'
+
       responses:
         '200':
           description: >-
diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml
index a87137ee007f16a000630a3bff41ddd971a645a6..a6ebd076d49169d4f1b9a1ce476cdd64309cdc39 100644
--- a/OpenAPI/TS28538_EdgeNrm.yaml
+++ b/OpenAPI/TS28538_EdgeNrm.yaml
@@ -121,6 +121,7 @@ components:
       enum:
         - ENABLED
         - DISABLED
+        - OVERLOAD_WARNING
     ResourceReservationRequirement:
       type: object
       properties:
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 11e810bb7e0eaab5b340e93b73a25b3fc9d0ccbc..2bcfbbec0f06422a8b05c3c724b18a81ff5f805a 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -167,10 +167,19 @@ components:
           type: integer
           minimum: 0
           maximum: 100
-        numberOfPreamblesSent:
-          type: integer
-          minimum: 0
-          maximum: 200
+        maxNumberOfPreamblesSent:
+          enum:
+            - n3
+            - n4
+            - n5
+            - n6
+            - n7
+            - n8
+            - n10
+            - n20
+            - n50
+            - n100
+            - n200
 
     UeAccDelayProbabilityDist:
       type: array
@@ -305,23 +314,9 @@ components:
         ipv6Address:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
 
-    CellIndividualOffset:
-      type: object
-      properties:
-        rsrpOffsetSSB:
-          type: integer
-        rsrqOffsetSSB:
-          type: integer
-        sinrOffsetSSB:
-          type: integer
-        rsrpOffsetCSI-RS:
-          type: integer
-        rsrqOffsetCSI-RS:
-          type: integer
-        sinrOffsetCSI-RS:
-          type: integer
     QOffsetRange:
       type: integer
+      default: 0
       enum:
         - -24
         - -22
@@ -354,21 +349,6 @@ components:
         - 3
         - 2
         - 1
-    QOffsetRangeList:
-      type: object
-      properties:
-        rsrpOffsetSSB:
-          $ref: '#/components/schemas/QOffsetRange'
-        rsrqOffsetSSB:
-          $ref: '#/components/schemas/QOffsetRange'
-        sinrOffsetSSB:
-          $ref: '#/components/schemas/QOffsetRange'
-        rsrpOffsetCSI-RS:
-          $ref: '#/components/schemas/QOffsetRange'
-        rsrqOffsetCSI-RS:
-          $ref: '#/components/schemas/QOffsetRange'
-        sinrOffsetCSI-RS:
-          $ref: '#/components/schemas/QOffsetRange'
     QOffsetFreq:
       type: number
     TReselectionNRSf:
@@ -967,6 +947,8 @@ components:
                       $ref: '#/components/schemas/QceIdMappingInfoList'
                     mdtUserConsentReqList:
                       $ref: '#/components/schemas/MdtUserConsentReqList'
+                    nRECMappingRuleRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -1335,7 +1317,11 @@ components:
                     nRTCI:
                       type: integer
                     cellIndividualOffset:
-                      $ref: '#/components/schemas/CellIndividualOffset'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/QOffsetRange'
+                      minItems: 6
+                      maxItems: 6  
                     adjacentNRCellRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     nRFreqRelationRef:
@@ -1372,7 +1358,11 @@ components:
                   type: object
                   properties:
                     offsetMO:
-                      $ref: '#/components/schemas/QOffsetRangeList'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/QOffsetRange'
+                      minItems: 6
+                      maxItems: 6 
                     blockListEntry:
                       type: array
                       items:
@@ -1435,7 +1425,11 @@ components:
               type: object
               properties:
                     cellIndividualOffset:
-                      $ref: '#/components/schemas/CellIndividualOffset'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/QOffsetRange'
+                      minItems: 6
+                      maxItems: 6  
                     blackListEntry:
                       type: array
                       items:
@@ -1718,6 +1712,10 @@ components:
               $ref: '#/components/schemas/NRFrequency-Multiple'
             ExternalGnbCuCpFunction:
               $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple'
+            ExternalGnbCuUpFunction:
+              $ref: '#/components/schemas/ExternalGnbCuUpFunction-Multiple'
+            ExternalGnbDuFunction:
+              $ref: '#/components/schemas/ExternalGnbDuFunction-Multiple'                            
     ExternalGnbCuUpFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2053,6 +2051,22 @@ components:
                     ephemerisInfos:
                       $ref: '#/components/schemas/EphemerisInfos'
 
+    NRECMappingRule-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              allOf:
+                - type: object
+                  properties:
+                    ecMRInputMinimumValue:
+                      type: integer
+                    ecMRInputMaximumValue:
+                      type: integer
+                    ecTimeInterval:
+                      type: integer
+
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
 
     GnbDuFunction-Multiple:
@@ -2211,6 +2225,10 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/EphemerisInfoSet-Single'
+    NRECMappingRule-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/NRECMappingRule-Single'
 
 #-------- Definitions in TS 28.541 for TS 28.532 ---------------------------------
 
@@ -2278,4 +2296,5 @@ components:
         - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single'
         - $ref: '#/components/schemas/NTNFunction-Single'
         - $ref: '#/components/schemas/EphemerisInfoSet-Single'
+        - $ref: '#/components/schemas/NRECMappingRule-Single'
 
diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml
index 121dc8f67f4d2c3a97d27200e1c9a19d54ea757b..3b6c18f57039d35368c82c972a4e9b32fae47a96 100755
--- a/OpenAPI/TS28541_SliceNrm.yaml
+++ b/OpenAPI/TS28541_SliceNrm.yaml
@@ -415,7 +415,9 @@ components:
         uLPktDelayVariation:
           $ref: '#/components/schemas/Float'
         sliceSubnetAvailability:
-          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'
+          type: array
+          items:
+            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'
 
     RANSliceSubnetProfile:
       type: object
@@ -571,7 +573,9 @@ components:
         uLPktDelayVariation:
           $ref: '#/components/schemas/Float'
         sliceSubnetAvailability:
-          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'
+          type: array
+          items:
+            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'
 
     ServiceProfile:
       type: object
@@ -667,7 +671,9 @@ components:
           uLPktDelayVariation:
             $ref: '#/components/schemas/Float'
           sliceAvailability:
-            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'
+            type: array
+            items:
+              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'
 
     SliceProfile:
       type: object
diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml
index f5985b380d3b5e0fe042a76a134ec72c1e6251dc..c14335c77b911863f273dc2335e6932de1e6e893 100755
--- a/OpenAPI/TS28623_ComDefs.yaml
+++ b/OpenAPI/TS28623_ComDefs.yaml
@@ -106,16 +106,15 @@ components:
           $ref: '#/components/schemas/Longitude'
         altitude:
           $ref: '#/components/schemas/Float'
-    ConvexGeoPolygon:
-      type: array
-      items:
-        $ref: '#/components/schemas/GeoCoordinate'
-      minItems: 3
     GeoArea:
-      type: object
-      properties:
-        convexGeoPolygon:
-          $ref: '#/components/schemas/ConvexGeoPolygon'
+      oneOf:
+        - type: object
+          properties:
+            geoPolygon:
+              type: array
+              items:
+                $ref: '#/components/schemas/GeoCoordinate'
+              minItems: 1
     GeoAreaToCellMapping:
       type: object
       properties:
@@ -238,6 +237,21 @@ components:
       description: >-
         The filter format shall be compliant to Jex (TS 32.161).
       type: string
+    JexConditions:
+      type: string
+      description: >-
+        The value of the string shall be a Jex expression that is compliant to the 
+        Jex conditions profile specified in clause 7.6 of TS 32.161.
+    JexNodeSelectionBasic:
+      type: string
+      description: >-
+        The value of the string shall be a Jex expression that is compliant to the 
+        Jex basic profile specified in clause 7.4 of TS 32.161.
+    JexNodeSelectionAdvanced:
+      type: string
+      description: >-
+        The value of the string shall be a Jex expression that is compliant to the 
+        Jex advanced profile specified in clause 7.5 of TS 32.161.
     SystemDN:
       type: string
 
@@ -289,7 +303,7 @@ components:
         timeTick:
           type: integer
         filter:
-          $ref: '#/components/schemas/Filter'
+          $ref: '#/components/schemas/JexConditions'
 
     ErrorResponseGet:
       description: >-
diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml
index a0b20fe331eb04fc84b438f734814a577bbc437c..6eeec5ba792dcdc827b62ab59791e2df90697f5f 100644
--- a/OpenAPI/TS28623_FileManagementNrm.yaml
+++ b/OpenAPI/TS28623_FileManagementNrm.yaml
@@ -19,7 +19,7 @@ components:
         for usage in the "FileDownloadJob".
       type: object
       properties:
-        jobId:
+        id:
           type: string
         status:
           type: string
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 081978338de880805c999e3b2fe9976a033a12c4..6d1fa60627895fdc4d5c62e77454595c1f9cb66d 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -207,7 +207,7 @@ components:
         This data type is the "ProcessMonitor" data type without specialisations.
       type: object
       properties:
-        jobId:
+        id:
           type: string
         status:
           type: string
diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml
index 23581d77711c1ee2a42c43c17f6ff70ea80a265c..c3aff2b14bd3862511bca404aceb4876ae9a6f17 100644
--- a/OpenAPI/TS28623_PmControlNrm.yaml
+++ b/OpenAPI/TS28623_PmControlNrm.yaml
@@ -49,6 +49,8 @@ components:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                 reportingCtrl:
                   $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ReportingCtrl'
+                _linkToFiles:
+                  type: string  
             Files:
               $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple'
 
diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
index e808716e6462346783a27da6db3e04b808418ab9..35de0f831d11005b255290c72bd19f75198a6cc8 100644
--- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml
+++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
@@ -29,7 +29,9 @@ components:
         - type: object
           properties:
             dataNodeSelector:
-              type: string
+              oneOf:
+                - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic'
+                - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced'
 
 #-------- Definition of concrete IOCs --------------------------------------------         
     NtfSubscriptionControl-Single:
@@ -49,7 +51,7 @@ components:
                 scope:
                   $ref: '#/components/schemas/Scope'
                 notificationFilter:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter'                
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions'                
             HeartbeatControl:
               $ref: '#/components/schemas/HeartbeatControl-Single'
     HeartbeatControl-Single:
diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml
index 5806dc39250ac8a2b4369194a73d6350065ec3dc..f5d59297b3df0326df75835e84ab7486cf000a91 100644
--- a/OpenAPI/TS28623_TraceControlNrm.yaml
+++ b/OpenAPI/TS28623_TraceControlNrm.yaml
@@ -808,13 +808,16 @@ components:
           items:
             type: string
             enum:
-              - M1
-              - M2
-              - M3
-              - M4
-              - M5
-              - M6
-              - M7
+              - M1_DL
+              - M2_DL
+              - M4_DL
+              - M4_UL
+              - M5_DL
+              - M5_UL
+              - M6_DL
+              - M6_UL
+              - M7_DL
+              - M7_UL
               - M1_EVENT_TRIGGERED
               - M8
               - M9