diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml
index 4290465aa8cc9e9fda12f6f9b433b7448a648134..2f0530b4b431159de2ead876ca9a0cc25430fc2b 100644
--- a/OpenAPI/TS28104_MdaNrm.yaml
+++ b/OpenAPI/TS28104_MdaNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: MDA NRM
-  version: 18.5.0
+  version: 18.6.0
   description: >-
     OAS 3.0.1 specification of the MDA NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -14,11 +14,29 @@ components:
   schemas:
 
 #-------- Definition of types-----------------------------------------------------
-
+    MDAType:
+      type: string
+      enum:
+        - COVERAGEANALYTICS_COVERAGEPROBLEMANALYSIS
+        - COVERAGEANALYTICS_PAGINGOPTIMIZATION
+        - SLSANALYSIS_SERVICEEXPERIENCEANALYSIS
+        - SLSANALYSIS_NETWORKSLICETHROUGHPUTANALYSIS
+        - SLSANALYSIS_NETWORKSLICETRAFFICANALYSIS
+        - SLSANALYSIS_E2ELATENCYANALYSIS
+        - SLSANALYSIS_NETWORKSLICELOADANALYSIS
+        - MDAASSISTEDFAULTMANAGEMENT_FAILUREPREDICTION
+        - MDAASSISTEDENERGYSAVING_ENERGYSAVINGANALYSIS
+        - MOBILITYMANAGEMENTANALYTICS_MOBILITYPERFORMANCEANALYSIS
+        - MOBILITYMANAGEMENTANALYTICS_HANDOVEROPTIMIZATION
+        - MAINTENANCE_MAINTENANCEANALYTICS
+        - RESOURCEANALYTICS_VIRTUALIZEDRESOURCEUTILIZATIONANALYSISNF
+        - RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF
+        - RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS
+        - PREDICTIONS_PMDATA
     MDATypes:
       type: array
       items:
-        type: string
+        $ref: '#/components/schemas/MDAType'
 
     MDAOutputs:
       type: array
@@ -34,8 +52,9 @@ components:
         - type: object
           properties:
             areaScope:
-              $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
- 
+              type: array
+              items:
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' 
 
     MDAOutputPerMDAType:
       type: object
@@ -55,7 +74,9 @@ components:
         filterValue:
           type: string
         threshold:
-          $ref: '#/components/schemas/ThresholdInfo'
+          type: array
+          items:
+            $ref: '#/components/schemas/ThresholdInfo'
         analyticsPeriod:
           $ref: '#/components/schemas/AnalyticsSchedule'
         timeOut:
diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml
index b57be4d1a8e53fd04bfad327601642a4218f4884..f3b97098d7412a5871fd6f7e33cd397990e2373f 100644
--- a/OpenAPI/TS28104_MdaReport.yaml
+++ b/OpenAPI/TS28104_MdaReport.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: MDA Report
-  version: 18.3.0
+  version: 18.6.0
   description: >-
     OAS 3.0.1 specification of the MDA Report
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -61,6 +61,8 @@ components:
                     mDAReportID:
                       type: string
                     mDAOutputs:
-                      $ref: '#/components/schemas/MDAOutputs'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/MDAOutputs'
                     mDARequestRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index 4bdb73a0e7787862d51903c1fd4f65846230569c..e85c31cb2e818b5b2cc2843ab83faf18fb97f211 100644
--- a/OpenAPI/TS28105_AiMlNrm.yaml
+++ b/OpenAPI/TS28105_AiMlNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: AI/ML NRM
-  version: 18.5.0
+  version: 18.6.0
   description: >-
     OAS 3.0.1 specification of the AI/ML NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -18,7 +18,7 @@ components:
     MLContext:
       type: object
       properties:
-        inferenceModelRef:
+        inferenceEntityRef:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
         dataProviderRef:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
@@ -110,7 +110,7 @@ components:
       type: object
       properties:
         aIMLInferenceName:
-          type: string
+          $ref: '#/components/schemas/AIMLInferenceName'
         capabilityName:
           type: string
         mLCapabilityParameters:
@@ -141,7 +141,7 @@ components:
           items:
             type: string
         aIMLInferenceName:
-          type: string
+          $ref: '#/components/schemas/AIMLInferenceName'
         inferenceOutputTime:
           type: array
           items:
@@ -152,7 +152,22 @@ components:
         outputResult:
           description: A map (list of key-value pairs) for Inference result name and it's value
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet'
-          
+    AIMLInferenceName:
+      oneOf:
+        - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType'
+        - $ref: '#/components/schemas/NwdafAnalyticsType'
+        - $ref: '#/components/schemas/NgRanInferenceType'
+        - $ref: '#/components/schemas/VSExtensionType' 
+    NwdafAnalyticsType:
+      $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent'
+    NgRanInferenceType:
+      type: string
+      enum:
+        - NG_RAN_NETWORK_ENERGY_SAVING
+        - NG_RAN_LOAD_BALANCING 
+        - NG_RAN_ MOBILITY_OPTIMIZATION
+    VSExtensionType:
+      type: string
 #-------- Definition of types for name-containments ------
     SubNetwork-ncO-AiMlNrm:
       type: object
@@ -226,7 +241,7 @@ components:
                 - type: object
                   properties:
                     aIMLInferenceName:
-                      type: string  
+                      $ref: '#/components/schemas/AIMLInferenceName'  
                     candidateTrainingDataSource:
                       type: array
                       items:
@@ -406,7 +421,7 @@ components:
                 - type: object
                   properties:
                     aIMLInferenceName:
-                      type: string
+                      $ref: '#/components/schemas/AIMLInferenceName'
                     policyForLoading:
                       $ref: '#/components/schemas/AIMLManagementPolicy'
                     mLModelRef:
@@ -445,7 +460,7 @@ components:
                 mLModelId:
                   type: string
                 aIMLInferenceName:
-                  type: string
+                  $ref: '#/components/schemas/AIMLInferenceName'
                 mLModelVersion:
                   type: string
                 expectedRunTimeContext:
@@ -455,7 +470,9 @@ components:
                 runTimeContext:
                   $ref: '#/components/schemas/MLContext'
                 supportedPerformanceIndicators:
-                  $ref: '#/components/schemas/SupportedPerfIndicator'
+                  type: array
+                  items:
+                    $ref: '#/components/schemas/SupportedPerfIndicator'
                 mLCapabilitiesInfoList:
                   type: array
                   items:
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index 3d018cb18699e9e39f4220c58e9f6ac3c4e9f368..f353412f6ad4a8eb06c538ffdfd596f80dc0bd43 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Intent NRM
-  version: 18.5.0
+  version: 18.6.0
   description: >-
     OAS 3.0.1 definition of the Intent NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -324,7 +324,7 @@ components:
       properties:
         intentFulfilmentInfo:
           $ref: '#/components/schemas/FulfilmentInfo'
-        expectationFulfilmentResult:
+        expectationFulfilmentResults:
           type: array
           items: 
             $ref: '#/components/schemas/ExpectationFulfilmentResult'
@@ -340,7 +340,7 @@ components:
           type: string
         expectationFulfilmentInfo:
           $ref: '#/components/schemas/FulfilmentInfo'
-        targetFulfilmentResult:
+        targetFulfilmentResults:
           type: array
           items: 
             $ref: '#/components/schemas/TargetFulfilmentResult'
@@ -410,9 +410,15 @@ components:
           enum:
               - FEASIBLE
               - INFEASIBLE
-        infeasibilityReason:
-          type: string
-          description: An attribute which is used when feasibilityCheckResult is INFEASIBLE          
+        infeasibilityReasons:
+          description: An attribute which is used when feasibilityCheckResult is INFEASIBLE 
+          type: array
+          items:
+            type: string
+            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..ce913eb9a874ba4ebf6a211379ac9ff5cb2742c8 100755
--- a/OpenAPI/TS28532_ProvMnS.yaml
+++ b/OpenAPI/TS28532_ProvMnS.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Provisioning MnS
-  version: 18.3.0
+  version: 18.5.0
   description: >-
     OAS 3.0.1 definition of the Provisioning MnS
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -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/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml
index 54d2c5898b80ac041fa454e444906e97297d9dab..1efd9ca6de95fb338ceba3ce85e3090b83674094 100755
--- a/OpenAPI/TS28536_CoslaNrm.yaml
+++ b/OpenAPI/TS28536_CoslaNrm.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.1
 
 info:
   title: coslaNrm
-  version: 18.2.0
+  version: 18.3.0
   description: >-
     OAS 3.0.1 specification of the Cosla NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -84,6 +84,8 @@ components:
           $ref: '#/components/schemas/AssuranceGoalStatusPredicted'
         assuranceGoalRef:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+        assuranceTargetStatusList:
+          $ref: '#/components/schemas/AssuranceTargetStatusList'
 
     AssuranceGoalStatusList:
       type: array
@@ -155,7 +157,9 @@ components:
                     controlLoopLifeCyclePhase:
                       $ref: '#/components/schemas/ControlLoopLifeCyclePhase'
                     aCCLDisallowedList:
-                      $ref: '#/components/schemas/ACCLDisallowedAttributes'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/ACCLDisallowedAttributes'
                     networkSliceRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     networkSliceSubnetRef:
diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml
index a87137ee007f16a000630a3bff41ddd971a645a6..919cf25b4afd8bd899af1cd1eb6d355545bbf154 100644
--- a/OpenAPI/TS28538_EdgeNrm.yaml
+++ b/OpenAPI/TS28538_EdgeNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: 3GPP Edge NRM
-  version: 18.8.0
+  version: 18.9.0
   description: >-
     OAS 3.0.1 specification of the Edge NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -121,6 +121,7 @@ components:
       enum:
         - ENABLED
         - DISABLED
+        - OVERLOAD_WARNING
     ResourceReservationRequirement:
       type: object
       properties:
@@ -153,9 +154,11 @@ components:
             - FUTURE
         futuristicTriggerTime:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
-    AvailableEDNList:
+    AvailableEDN:
       type: object
       properties:
+        availableEDN:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
         resourceQuota:
           $ref: '#/components/schemas/VirtualResource'
     FederatedECSInfo:
@@ -385,8 +388,10 @@ components:
               $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
             leadingOPiD:
               type: string
-            avaibleEDNList:
-              $ref: '#/components/schemas/AvailableEDNList'
+            availableEDNList:
+              type: array
+              items:
+                $ref: '#/components/schemas/AvailableEDN'
             acceptedEDN:
               $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
     OperatorEdgeDataNetwork-Single:
diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 9ed184190ad7e09579c6bc6cf906bf72e6900a25..82448ccc66cf155fc5b825855395adfab01d58dc 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: 3GPP 5GC NRM
-  version: 18.9.0
+  version: 18.10.0
   description: >-
     OAS 3.0.1 specification of the 5GC NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -106,7 +106,7 @@ components:
             $ref: '#/components/schemas/IpEndPoint'
         apiPrefix:
           type: string
-        allowedPlmns:
+        allowedPlMNs:
           type: array
           items:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
@@ -114,7 +114,7 @@ components:
           type: array
           items:
             $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
-        allowedNssais:
+        allowedNSSAIs:
           type: array
           items:
             $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
@@ -223,7 +223,7 @@ components:
     ManagedNFProfile:
       type: object
       properties:
-        nfInstanceID:
+        nfInstanceId:
           type: string
         interPlmnFqdn:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
@@ -1614,13 +1614,13 @@ components:
       description: Information of an AMF NF Instance
       type: object
       required:
-        - amfSetId
-        - amfRegionId
+        - aMFSetId
+        - aMFRegionId
         - guamiList
       properties:
-        amfSetId:
+        aMFSetId:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfSetId'
-        amfRegionId:
+        aMFRegionId:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfRegionId'
         guamiList:
           type: array
@@ -2293,14 +2293,14 @@ components:
       description:  globally identification of an NG-RAN node
       type: object
       oneOf:
-        - required: [ pLmnId, n3IwfId]
-        - required: [ plmnId, gNbId]
-        - required: [ pLmnId, ngeNbId]
-        - required: [ plmnId, wagfId]
-        - required: [ pLmnId, tngfId]
-        - required: [ plmnId, twifId]
+        - required: [ pLMNId, n3IwfId]
+        - required: [ plMNId, gNbId]
+        - required: [ pLMNId, ngeNbId]
+        - required: [ plMNId, wagfId]
+        - required: [ pLMNId, tngfId]
+        - required: [ plMNId, twifId]
       properties:
-        pLmnId:
+        pLMNId:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         n3IwfId:
           type: string
@@ -2319,7 +2319,12 @@ components:
           type: string
           pattern: '^[A-Fa-f0-9]+$'
         twifId:
-          type: string          
+          type: string
+    NTNPLMNRestrictionsList:
+      description: NTNPLMNRestrictionsInfoList that relates to non-terrestrial network access
+      type: array
+      items:
+        $ref: '#/components/schemas/NTNPLMNRestrictionsInfo'
     NTNPLMNRestrictionsInfo:
       description: restrictions per PLMN that relates to non-terrestrial network access
       type: object
@@ -2329,34 +2334,24 @@ components:
         blockedLocationInfoList:
           type: array
           items:
-            $ref: '#/components/schemas/BlockedLocationInfoList'
-          minItems: 1
-    BlockedLocationInfoList:
+            $ref: '#/components/schemas/BlockedLocationInfo'
+    BlockedLocationInfo:
       description: location for which the PLMN access restrictions are to be applied in case of NTN
       type: object
       properties:
         blockedLocation:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
-        blockedDur:
-          $ref: '#/components/schemas/TimeDuration'
+        blockedDurWindow:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
         blockedSlice:
           $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
-    TimeDuration:
-      description: location for which the PLMN access restrictions are to be applied in case of NTN
-      type: object
-      properties:
-        blockedDurStartTime:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
-        blockedDurEndTime:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
-
     5GDdnmfInfo:
       description: Information of an 5G DDNMF NF Instance
       type: object
       required:
-        - plmnId
+        - plMNId
       properties:
-        plmnId:
+        plMNId:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
     ImsiRange:
       description: >
@@ -2575,7 +2570,7 @@ components:
         mbsServiceIdEnd:
           type: string
           pattern: '^[A-Fa-f0-9]{6}$'
-        plmnId:
+        plMNId:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
         nid:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/Nid'
@@ -2630,7 +2625,7 @@ components:
           type: string
           pattern: '^[A-Fa-f0-9]{6}$'
           description: MBS Service ID
-        plmnId:
+        plMNId:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
       required:
         - mbsServiceId
@@ -2688,7 +2683,7 @@ components:
       description: Contains the NCGI (NR Cell Global Identity), as described in 3GPP 23.003
       type: object
       properties:
-        plmnId:
+        plMNId:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
         nrCellId:
           type: string
@@ -3052,8 +3047,8 @@ components:
                       $ref: '#/components/schemas/ManagedNFProfile'
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
-                    nTNPLMNInfoList:
-                      $ref: '#/components/schemas/NTNPLMNRestrictionsInfo'
+                    nTNPLMNRestrictionsList:
+                      $ref: '#/components/schemas/NTNPLMNRestrictionsList'
                     amfInfo:
                       $ref: '#/components/schemas/AmfInfo'
                     sliceExpiryInfo:
@@ -4457,7 +4452,7 @@ components:
               allOf:
                 - type: object
                   properties:
-                    FiveQiDscpMappingList:
+                    fiveQiDscpMappingList:
                       type: array
                       items:
                         $ref: '#/components/schemas/FiveQiDscpMapping'
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 11e810bb7e0eaab5b340e93b73a25b3fc9d0ccbc..75137816541eb8855298fab5feb48709e7143e78 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: NR NRM
-  version: 18.9.0
+  version: 18.10.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -109,7 +109,7 @@ components:
     MappingSetIDBackhaulAddress:
       type: object
       properties:
-        setID:
+        setId:
           type: integer
         backhaulAddress:
           $ref: '#/components/schemas/BackhaulAddress'
@@ -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:
@@ -563,7 +543,7 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/RimRSReportInfo'
-    TceMappingInfo:
+    TceIDMappingInfo:
       type: object
       properties:
         TceIPAddress:
@@ -574,10 +554,10 @@ components:
           type: integer
         PlmnTarget:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
-    TceMappingInfoList:
+    TceIDMappingInfoList:
       type: array
       items:
-        $ref: '#/components/schemas/TceMappingInfo'
+        $ref: '#/components/schemas/TceIDMappingInfo'
     ResourceType:
       type: string
       enum:
@@ -948,9 +928,11 @@ components:
                     xnHOBlackList:
                       $ref: '#/components/schemas/GGnbIdList'
                     mappingSetIDBackhaulAddress:
-                      $ref: '#/components/schemas/MappingSetIDBackhaulAddress'
-                    tceMappingInfoList:
-                      $ref: '#/components/schemas/TceMappingInfoList'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/MappingSetIDBackhaulAddress'
+                    tceIDMappingInfoList:
+                      $ref: '#/components/schemas/TceIDMappingInfoList'
                     configurable5QISetRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
@@ -967,6 +949,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:
@@ -1173,7 +1157,7 @@ components:
                     type: integer
                     minimum: 0
                     maximum: 3279165
-                  ssbSubCarrierSpacing:
+                  sSBSubCarrierSpacing:
                     $ref: '#/components/schemas/SsbSubCarrierSpacing'
                   multiFrequencyBandListNR:
                     type: integer
@@ -1335,7 +1319,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,15 +1360,23 @@ components:
                   type: object
                   properties:
                     offsetMO:
-                      $ref: '#/components/schemas/QOffsetRangeList'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/QOffsetRange'
+                      minItems: 6
+                      maxItems: 6 
                     blockListEntry:
                       type: array
                       items:
                         type: integer
                         minimum: 0
-                        maximum: 1007
+                        maximum: 503
                     blockListEntryIdleMode:
-                      type: integer
+                      type: array
+                      items:
+                        type: integer
+                        minimum: 0
+                        maximum: 1007
                     cellReselectionPriority:
                       type: integer
                     cellReselectionSubPriority:
@@ -1435,15 +1431,23 @@ components:
               type: object
               properties:
                     cellIndividualOffset:
-                      $ref: '#/components/schemas/CellIndividualOffset'
-                    blackListEntry:
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/QOffsetRange'
+                      minItems: 6
+                      maxItems: 6  
+                    blockListEntry:
+                      type: array
+                      items:
+                        type: integer
+                        minimum: 0
+                        maximum: 503
+                    blockListEntryIdleMode:
                       type: array
                       items:
                         type: integer
                         minimum: 0
                         maximum: 1007
-                    blackListEntryIdleMode:
-                      type: integer
                     cellReselectionPriority:
                       type: integer
                     cellReselectionSubPriority:
@@ -1718,6 +1722,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 +2061,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 +2235,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 +2306,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..215139ba0b83b7dc12e24ed905b2a2df84390d33 100755
--- a/OpenAPI/TS28541_SliceNrm.yaml
+++ b/OpenAPI/TS28541_SliceNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Slice NRM
-  version: 18.8.0
+  version: 18.10.0
   description: >-
     OAS 3.0.1 specification of the Slice NRM
     @ 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -144,6 +144,15 @@ components:
           $ref: '#/components/schemas/ServAttrCom'
         nOofPDUSessions:
           type: integer
+    MaxNumberofUEs:
+      type: object
+      properties:
+        servAttrCom:
+          $ref: '#/components/schemas/ServAttrCom'
+        3GPPNoOfUEs:
+          type: integer
+        non3GPPNoOfUEs:
+          type: integer
     KPIMonitoring:
       type: object
       properties:
@@ -355,7 +364,7 @@ components:
       type: object
       properties:
         maxNumberofUEs:
-          type: integer
+          $ref: '#/components/schemas/MaxNumberofUEs'
         dLLatency:
           type: number
         uLLatency:
@@ -415,7 +424,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
@@ -431,7 +442,7 @@ components:
         resourceSharingLevel:
           $ref: '#/components/schemas/SharingLevel'
         maxNumberofUEs:
-          type: integer
+          $ref: '#/components/schemas/MaxNumberofUEs'
         activityFactor:
           type: integer
         dLThptPerSliceSubnet:
@@ -497,7 +508,7 @@ components:
         uLLatency:
           type: integer
         maxNumberofUEs:
-          type: integer
+          $ref: '#/components/schemas/MaxNumberofUEs'
         dLThptPerSliceSubnet:
           $ref: '#/components/schemas/XLThpt'
         dLThptPerUE:
@@ -571,7 +582,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
@@ -581,7 +594,7 @@ components:
           plmnInfoList:
             $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'
           maxNumberofUEs:
-            type: number
+            $ref: '#/components/schemas/MaxNumberofUEs'
           dLLatency:
             type: number
           uLLatency:
@@ -667,7 +680,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
@@ -900,7 +915,7 @@ components:
                   type: string 
                 epApplicationRefs:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
-                connectionPointRefList:
+                externalEndPointRefList:
                   type: array
                   items:
                     $ref: '#/components/schemas/ConnectionPointInfo'
diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml
index f5985b380d3b5e0fe042a76a134ec72c1e6251dc..8c62eb9d1c7ff132eeb2095893ade4892db71a38 100755
--- a/OpenAPI/TS28623_ComDefs.yaml
+++ b/OpenAPI/TS28623_ComDefs.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Common Type Definitions
-  version: 18.7.0
+  version: 18.9.0
   description: >-
     OAS 3.0.1 specification of common type definitions in the Generic NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -106,16 +106,17 @@ components:
           $ref: '#/components/schemas/Longitude'
         altitude:
           $ref: '#/components/schemas/Float'
-    ConvexGeoPolygon:
+    GeoPolygon:
       type: array
       items:
         $ref: '#/components/schemas/GeoCoordinate'
-      minItems: 3
+      minItems: 1
     GeoArea:
-      type: object
-      properties:
-        convexGeoPolygon:
-          $ref: '#/components/schemas/ConvexGeoPolygon'
+      oneOf:
+        - type: object
+          properties:
+            geoPolygon:
+              $ref: '#/components/schemas/GeoCoordinate'
     GeoAreaToCellMapping:
       type: object
       properties:
@@ -238,6 +239,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 +305,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..4a84bd5236b937e8707089c7139018fd437d7b25 100644
--- a/OpenAPI/TS28623_FileManagementNrm.yaml
+++ b/OpenAPI/TS28623_FileManagementNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: File Management NRM
-  version: 18.7.0
+  version: 18.9.0
   description: >-
     OAS 3.0.1 definition of the File Management NRM fragment
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -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..c0e76d70c2c28c4d87a2310390d9bf972c7f4dbe 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Generic NRM
-  version: 18.8.0
+  version: 18.9.0
   description: >-
     OAS 3.0.1 definition of the Generic NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -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..a53978b099f3ba87b90dd56039546f6e44cf76f7 100644
--- a/OpenAPI/TS28623_PmControlNrm.yaml
+++ b/OpenAPI/TS28623_PmControlNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: PM control NRM 
-  version: 18.6.0
+  version: 18.9.0
   description: >-
     OAS 3.0.1 definition of the PM control NRM fragment
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -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..479f338745c0236ce89b333fbdea2060d5beb342 100644
--- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml
+++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Subscription Control NRM
-  version: 18.8.0
+  version: 18.9.0
   description: >-
     OAS 3.0.1 definition of the Subscription Control NRM fragment
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -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..8d3a24b0a0c99f71e8bb8a5b2a577949ba8b511f 100644
--- a/OpenAPI/TS28623_TraceControlNrm.yaml
+++ b/OpenAPI/TS28623_TraceControlNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Trace Control NRM
-  version: 18.8.0
+  version: 18.9.0
   description: >-
     OAS 3.0.1 definition of the Trace Control NRM fragment
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -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
@@ -1377,7 +1380,7 @@ components:
         areaScope:
           type: array
           items:
-            $ref: '#/components/schemas/AreaScope'
+            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/AreaScope'
         sensorInformation:
           $ref: '#/components/schemas/sensorInformation-Type'
         immediateMDTConfig:
@@ -1390,7 +1393,9 @@ components:
       type: object
       properties:
         ueCoreMeasurements:
-          type: string
+          type: array 
+          items:
+            type: string
         ueCoreMeasGranularityPeriod:
           type: integer
         nfTypeToMeasure:
@@ -1400,23 +1405,6 @@ components:
         rootObjectInstances:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
 
-    AreaScope:
-      oneOf:
-      - type: array
-        items:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/EutraCellId'
-      - type: array
-        items:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/NrCellId'
-      - type: array
-        items:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Tac'
-      - type: array
-        items:
-          $ref: '#/components/schemas/Tai'
-      - type: array
-        items:
-          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type'
     Tai:
       type: object
       properties:
@@ -1467,6 +1455,8 @@ components:
           $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type'
         listOfTraceMetrics:
           type: array
+          items:
+            type: string
         traceReportingConsumerUri:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
         traceCollectionEntityIpAddress: