diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml
index c229cc7d83a8e88075b1297a3beca6855b6a42f1..4290465aa8cc9e9fda12f6f9b433b7448a648134 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.4.0
+  version: 18.5.0
   description: >-
     OAS 3.0.1 specification of the MDA NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -107,6 +107,7 @@ components:
               format: float
               minimum: 0
 
+
 #-------- Definition of types for name-containments ------
     SubNetwork-ncO-MdaNrm:
       type: object
@@ -138,15 +139,17 @@ components:
                   properties:
                     supportedMDACapabilities:
                       $ref: '#/components/schemas/MDATypes'
-                    mlModelRef:
-                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-                    aIMLInferenceFunctionRef:
-                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'  
+                    mLModelRefList:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+                    aIMLInferenceFunctionRefList:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'  
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             MDARequest:
               $ref: '#/components/schemas/MDARequest-Multiple'
+            MDAReport:
+              $ref: '#/components/schemas/MDAReport-Multiple'
 
     MDARequest-Single:
       allOf:
diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index 7566d90a21594f143cf809d49baa0f4239ab2235..4bdb73a0e7787862d51903c1fd4f65846230569c 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.4.0
+  version: 18.5.0
   description: >-
     OAS 3.0.1 specification of the AI/ML NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -348,9 +348,6 @@ components:
             attributes:
               allOf:
                 - type: object
-                  oneOf:
-                    - required: [ requestStatus, mLModelToTestRef ]
-                    - required: [ requestStatus, mLModelCoordinationGroupToTestRef ]
                   properties:
                     requestStatus:
                       $ref: '#/components/schemas/RequestStatus'
@@ -358,9 +355,9 @@ components:
                       type: boolean
                     suspendRequest:
                       type: boolean                  
-                    mLModelToTestRef:
+                    mLModelRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-                    mLModelCoordinationGroupToTestRef:
+                    mLModelCoordinationGroupRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
 
     MLTestingReport-Single:
@@ -467,6 +464,10 @@ components:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                 sourceTrainedMLModelRef:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                aIMLInferenceReportRefList:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+                usedByFunctionRefList:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
 
     MLModelRepository-Single:
       allOf:
@@ -542,7 +543,7 @@ components:
                   type: boolean 
                 mLUpdateProcessRef:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-                mLModelRef:
+                mLModelRefList:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
 
     MLUpdateProcess-Single:
@@ -555,9 +556,13 @@ components:
               properties:
                 progressStatus:
                   $ref: '#/components/schemas/ProcessMonitor'
-                mLModelRef:
+                cancelProcess:
+                  type: boolean
+                suspendProcess:
+                  type: boolean
+                mLModelRefList:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
-                mLUpdateRequestRef:
+                mLUpdateRequestRefList:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                 mLUpdateReportRef:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
@@ -572,7 +577,7 @@ components:
               properties:
                 updatedMLCapability:
                   $ref: '#/components/schemas/AvailMLCapabilityReport'
-                mLModelRef:
+                mLModelRefList:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                 mLUpdateProcessRef:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
@@ -596,7 +601,7 @@ components:
                       $ref: '#/components/schemas/AIMLManagementPolicy'
                     usedByFunctionRefList:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
-                    mLModelRef:
+                    mLModelRefList:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
@@ -626,7 +631,7 @@ components:
                       items:
                         $ref: '#/components/schemas/InferenceOutput'
                       minItems: 1
-                    mLModelRef:
+                    mLModelRefList:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
 
     AIMLInferenceEmulationFunction-Single:
@@ -639,7 +644,7 @@ components:
                 - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
-                    AIMLInferenceEmulationReport:
+                    AIMLInferenceReport:
                       $ref: '#/components/schemas/AIMLInferenceReport-Multiple'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
 
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index dc5c4d4e48ca9d7641779bc7bd27ebe49288c5ec..3d018cb18699e9e39f4220c58e9f6ac3c4e9f368 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.4.0
+  version: 18.5.0
   description: >-
     OAS 3.0.1 definition of the Intent NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -64,10 +64,7 @@ components:
             maximum: 100
             description: It expresses the priority of the stated intent within a MnS consumer.   
           intentPreemptionCapability:
-            type: string
-            enum:
-              - TRUE
-              - FALSE
+            type: boolean
           observationPeriod:
             type: integer
             description: >- 
diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml
index a81e08261fc6cd845e072718fccae9bdee4553ce..54d2c5898b80ac041fa454e444906e97297d9dab 100755
--- a/OpenAPI/TS28536_CoslaNrm.yaml
+++ b/OpenAPI/TS28536_CoslaNrm.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.1
 
 info:
   title: coslaNrm
-  version: 18.1.0
+  version: 18.2.0
   description: >-
     OAS 3.0.1 specification of the Cosla NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -156,12 +156,14 @@ components:
                       $ref: '#/components/schemas/ControlLoopLifeCyclePhase'
                     aCCLDisallowedList:
                       $ref: '#/components/schemas/ACCLDisallowedAttributes'
+                    networkSliceRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                    networkSliceSubnetRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+            AssuranceReport:
+              $ref: '#/components/schemas/AssuranceReport-Single'
             AssuranceGoal:
               $ref: '#/components/schemas/AssuranceGoal-Multiple'
-              networkSliceRef:
-                $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-              networkSliceSubnetRef:
-                $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
 
     AssuranceGoal-Single:
       allOf:
diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml
index 0848b77d43bfaeb0f655cfe23151d47ccfde4018..a87137ee007f16a000630a3bff41ddd971a645a6 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.7.0
+  version: 18.8.0
   description: >-
     OAS 3.0.1 specification of the Edge NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -88,6 +88,17 @@ components:
           type: string
         swImageRef:
           type: string
+    RegistrationInfo:
+      type: object
+      properties:
+        registrationExpiry:
+          type: string
+          readOnly: true
+        registrationID:
+          type: string
+          readOnly: true
+        secCredential:
+          type: string
     Duration:
       type: object
       properties:
@@ -205,6 +216,8 @@ components:
                       type: array
                       items:
                         type: string
+                    registrationInfo:
+                      $ref: '#/components/schemas/RegistrationInfo'  
                     eASRequirementsRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     eASAddress:
@@ -271,6 +284,9 @@ components:
                       type: boolean
                     eASFunctionRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'  
+                    registrationInfo:
+                      $ref: '#/components/schemas/RegistrationInfo'  
+
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
 
     ECSFunction-Single:
diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 44dc93e1c80245cd60b6bdd8aef483b28055fe5b..9ed184190ad7e09579c6bc6cf906bf72e6900a25 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.8.0
+  version: 18.9.0
   description: >-
     OAS 3.0.1 specification of the 5GC NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -59,17 +59,21 @@ components:
       type: object
       description: 'NF profile stored in NRF, defined in TS 29.510'
       properties:
-        nFInstanceId:
+        nfInstanceId:
           type: string
           description: uuid of NF instance
-        nFType:
+        nfType:
           $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
-        nFStatus:
+        nfStatus:
           $ref: '#/components/schemas/NFStatus'
         plmn:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
+          type: array
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         sNssais:
-          $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
+          type: array
+          items:
+            $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
         fqdn:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
         interPlmnFqdn:
@@ -86,8 +90,10 @@ components:
           type: string
         serviceName:
           type: string
-        version:
-          type: string
+        versions:
+          type: array
+          items:
+            type: string
         schema:
           type: string
         fqdn:
@@ -98,10 +104,12 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/IpEndPoint'
-        apiPrfix:
+        apiPrefix:
           type: string
         allowedPlmns:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
+          type: array
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         allowedNfTypes:
           type: array
           items:
@@ -217,6 +225,8 @@ components:
       properties:
         nfInstanceID:
           type: string
+        interPlmnFqdn:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
         nfType:
           $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
         heartbeatTimer:
@@ -787,12 +797,10 @@ components:
           type: array
           items:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
-          minItems: 1
         ipv6EndpointAddresses:
           type: array
           items:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
-          minItems: 1
         fqdn:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
         networkInstance:
@@ -812,9 +820,13 @@ components:
       type: object
       properties:
         ipv4EndpointAddresses:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
+          type: array
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
         ipv6EndpointAddresses:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
+          type: array
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
         fqdn:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
 
@@ -2328,7 +2340,7 @@ components:
         blockedDur:
           $ref: '#/components/schemas/TimeDuration'
         blockedSlice:
-          type: string
+          $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
@@ -3030,8 +3042,6 @@ components:
                       $ref: '#/components/schemas/AmfIdentifier'
                     sBIFqdn:
                       type: string
-                    interPlmnFQDN:
-                      type: string
                     weightFactor:
                       $ref: '#/components/schemas/WeightFactor'
                     cNSIIdList:
@@ -3077,8 +3087,8 @@ components:
               $ref: '#/components/schemas/EP_N22-Multiple'
             EP_N26:
               $ref: '#/components/schemas/EP_N26-Multiple'
-            EP_NLS:
-              $ref: '#/components/schemas/EP_NLS-Multiple'
+            EP_NL1:
+              $ref: '#/components/schemas/EP_NL1-Multiple'
             EP_NL2:
               $ref: '#/components/schemas/EP_NL2-Multiple'
             EP_N58:
@@ -3521,8 +3531,8 @@ components:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
-            EP_NLS:
-              $ref: '#/components/schemas/EP_NLS-Multiple'
+            EP_NL1:
+              $ref: '#/components/schemas/EP_NL1-Multiple'
     NgeirFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -4267,7 +4277,7 @@ components:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                     remoteAddress:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
-    EP_NLS-Single:
+    EP_NL1-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
         - type: object
@@ -4576,6 +4586,19 @@ components:
                       type: integer
                     qFMeasurementPeriod:
                       type: integer
+                    qFMonitoredSatelliteBackhaulCategories:
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/SatelliteBackhaulCategories'
+
+    SatelliteBackhaulCategories:
+      type: string
+      description: any of enumerated value
+      enum:
+        - DYNAMIC_GEO
+        - DYNAMIC_MEO
+        - DYNAMIC_LEO
+        - DYNAMIC_OTHER_SAT
 
     PredefinedPccRuleSet-Single:
       allOf:
@@ -4637,8 +4660,8 @@ components:
                       type: string
                     cNSIIdList:
                       $ref: '#/components/schemas/CNSIIdList'
-                    nFProfileList:
-                      $ref: '#/components/schemas/NFProfileList'
+                    managedNFProfile:
+                      $ref: '#/components/schemas/ManagedNFProfile'
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
                     nssafInfo:
@@ -5259,6 +5282,10 @@ components:
                       enum:
                         - ACTIVATED
                         - DEACTIVATED
+                    mLModelRefList:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+                    aIMLInferenceFunctionRefList:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
     EP_SM12-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -5549,10 +5576,10 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/EP_MAP_SMSC-Single'
-    EP_NLS-Multiple:
+    EP_NL1-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/EP_NLS-Single'
+        $ref: '#/components/schemas/EP_NL1-Single'
     EP_NL2-Multiple:
       type: array
       items:
@@ -5838,7 +5865,7 @@ components:
        - $ref: '#/components/schemas/EP_S5U-Single'
        - $ref: '#/components/schemas/EP_Rx-Single'
        - $ref: '#/components/schemas/EP_MAP_SMSC-Single'
-       - $ref: '#/components/schemas/EP_NLS-Single'
+       - $ref: '#/components/schemas/EP_NL1-Single'
        - $ref: '#/components/schemas/EP_NL2-Single'
        - $ref: '#/components/schemas/EP_NL3-Single'
        - $ref: '#/components/schemas/EP_NL5-Single'
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 62e23de93760987a78e011b7ca67c887b8be1dac..11e810bb7e0eaab5b340e93b73a25b3fc9d0ccbc 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.8.0
+  version: 18.9.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -996,6 +996,10 @@ components:
               $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple'
             Dynamic5QISet:
               $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple'
+            NRNetwork:
+              $ref: '#/components/schemas/NRNetwork-Single'
+            EUtranNetwork:  
+              $ref: '#/components/schemas/EUtraNetwork-Single'
 
     NrCellCu-Single:
       allOf:
@@ -1102,9 +1106,9 @@ components:
                       description: "Condition is BWP sets are supported"
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'                    
                     rimRSMonitoringStartTime:
-                      type: string
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                     rimRSMonitoringStopTime:
-                      type: string
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                     rimRSMonitoringWindowDuration:
                       type: integer
                     rimRSMonitoringWindowStartingOffset:
@@ -1705,6 +1709,15 @@ components:
               $ref: '#/components/schemas/EP_F1C-Multiple'
             EP_F1U:
               $ref: '#/components/schemas/EP_F1U-Multiple'
+    NRNetwork-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            NRFrequency:
+              $ref: '#/components/schemas/NRFrequency-Multiple'
+            ExternalGnbCuCpFunction:
+              $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple'
     ExternalGnbCuUpFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1775,6 +1788,15 @@ components:
                     nRFrequencyRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+    EUtraNetwork-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            EUtranFrequency:
+              $ref: '#/components/schemas/EUtranFrequency-Multiple'
+            ExternalENBFunction:
+              $ref: '#/components/schemas/ExternalENBFunction-Multiple'
     ExternalENBFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2203,6 +2225,9 @@ components:
         - $ref: '#/components/schemas/NrCellDu-Single'
         - $ref: '#/components/schemas/NrOperatorCellDu-Single'
 
+        - $ref: '#/components/schemas/NRNetwork-Single'
+        - $ref: '#/components/schemas/EUtraNetwork-Single'
+
         - $ref: '#/components/schemas/NRFrequency-Single'
         - $ref: '#/components/schemas/EUtranFrequency-Single'
 
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 695a96fa442dded3b0438515c7de8c8ad024ef97..081978338de880805c999e3b2fe9976a033a12c4 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.7.0
+  version: 18.8.0
   description: >-
     OAS 3.0.1 definition of the Generic NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -201,23 +201,7 @@ components:
           properties:
             streamTarget:
               $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
-    Scope:
-      oneOf:
-        - type: object
-          properties:
-            scopeType:
-              type: string
-              enum:
-                - BASE_ONLY
-                - BASE_ALL
-                - BASE_NTH_LEVEL
-                - BASE_SUBTREE
-            scopeLevel:
-              type: integer
-        - type: object
-          properties:
-            dataNodeSelector:
-              type: string
+
     ProcessMonitor:
       description: >-
         This data type is the "ProcessMonitor" data type without specialisations.
@@ -250,23 +234,23 @@ components:
         timer:
           type: integer
     AreaScope:
-      oneOf:
-      - type: array
-        items:
-          $ref: '#/components/schemas/EutraCellId'
-      - type: array
-        items:
-          $ref: '#/components/schemas/NrCellId'
-      - type: array
-        items:
-          $ref: '#/components/schemas/Tac'
-      - type: array
-        items:
-          $ref: '#/components/schemas/Tai'
+      allOf:
       - type: array
         items:
           $ref: '#/components/schemas/NpnId-Type'
-
+      - oneOf:
+        - type: array
+          items:
+            $ref: '#/components/schemas/EutraCellId'
+        - type: array
+          items:
+            $ref: '#/components/schemas/NrCellId'
+        - type: array
+          items:
+            $ref: '#/components/schemas/Tac'
+        - type: array
+          items:
+            $ref: '#/components/schemas/Tai'
     Tai:
       type: object
       properties:
diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
index 5d493262645fbb6458f8ab4ea7730cecd0226216..e808716e6462346783a27da6db3e04b808418ab9 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.7.0
+  version: 18.8.0
   description: >-
     OAS 3.0.1 definition of the Subscription Control NRM fragment
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -14,17 +14,22 @@ components:
   schemas:
 #-------- Definition of types-----------------------------------------------------
     Scope:
-      type: object
-      properties:
-        scopeType:
-          type: string
-          enum:
-            - BASE_ONLY
-            - BASE_ALL
-            - BASE_NTH_LEVEL
-            - BASE_SUBTREE
-        scopeLevel:
-          type: integer
+      oneOf:
+        - type: object
+          properties:
+            scopeType:
+              type: string
+              enum:
+                - BASE_ONLY
+                - BASE_ALL
+                - BASE_NTH_LEVEL
+                - BASE_SUBTREE
+            scopeLevel:
+              type: integer
+        - type: object
+          properties:
+            dataNodeSelector:
+              type: string
 
 #-------- Definition of concrete IOCs --------------------------------------------         
     NtfSubscriptionControl-Single:
diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml
index 0d09284e0e6357c9c2f8d90966a5e65af059ba66..5806dc39250ac8a2b4369194a73d6350065ec3dc 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.7.0
+  version: 18.8.0
   description: >-
     OAS 3.0.1 definition of the Trace Control NRM fragment
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -261,6 +261,8 @@ components:
               - N20
               - N22
               - N26
+              - N41
+              - N42
         AUSFInterfaces:
           type: array
           items:
@@ -297,6 +299,7 @@ components:
               - N5
               - N7
               - N15
+              - N28
         SMFInterfaces:
           type: array
           items:
@@ -307,6 +310,10 @@ components:
               - N10
               - N11
               - S5-C
+              - N16
+              - N16a
+              - N38
+              - N40
         SMSFInterfaces:
           type: array
           items:
@@ -399,9 +406,6 @@ components:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc'
         mnc:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc'
-      required:
-        - mcc
-        - mnc
 
     listOfTraceMetrics:
       description: The trace metrics to be reported. See 3GPP TS 32.422 clause 10 for additional details.
@@ -432,10 +436,6 @@ components:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc'
         traceId:
           type: string
-      required:
-        - mcc
-        - mnc
-        - traceId
 
     traceReportingFormat-Type:
       type: string
@@ -465,13 +465,10 @@ components:
             - SUPI
         TargetIdValue:
           type: string
-      required:
-        - TargetIdType
-        - TargetIdValue
     
     triggeringEvents-Type:
       type: object
-      description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional detials.
+      description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional details.
       properties:
         MSC_SERVER:
           type: array
@@ -556,6 +553,7 @@ components:
               - NetworkDeregistration
               - UEMobilityFromEPC
               - UEMobilityToEPC
+              - ConvergedChargingService
         SMF:
           type: array
           items:
@@ -567,6 +565,9 @@ components:
               - PDUsessionUPactivationDeactivation
               - MobilityBtw3gppAndN3gppTo5GC
               - MobilityFromEpc
+              - MobilityBtwISMForVSMF
+              - ConvergedChargingService
+              - OfflineOnlyCharging
         PCF:
           type: array
           items:
@@ -576,6 +577,7 @@ components:
               - SMpolicy
               - Authorization
               - BDTpolicy
+              - SpendingLimitControl
         UPF:
           type: array
           items:
@@ -639,7 +641,7 @@ components:
       description: Determines whether beam level measurements shall be included in case of immediate MDT M1 measurement in NR. For additional details see 3GPP TS 32.422 clause 5.10.40.
       type: boolean
     
-    collectionPeriodRrmLte-Type:
+    collectionPeriodRRMLTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.20.
       type: string
       enum:
@@ -654,7 +656,7 @@ components:
         - 10240ms
         - 60000ms
 
-    collectionPeriodM6Lte-Type:
+    collectionPeriodM6LTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.32.
       type: string
       enum:
@@ -663,13 +665,13 @@ components:
         - 5120ms
         - 10240ms
 
-    collectionPeriodM7Lte-Type:
+    collectionPeriodM7LTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.33.
       type: integer
       minimum: 1
       maximum: 60
 
-    collectionPeriodRrmUmts-Type:
+    collectionPeriodRRMUMTS-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.21.
       type: string
       enum:
@@ -682,7 +684,7 @@ components:
         - 4000ms
         - 6000ms
     
-    collectionPeriodRrmNr-Type:
+    collectionPeriodRRMNR-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.30.
       type: string
       enum:
@@ -692,7 +694,7 @@ components:
         - 10240ms
         - 60000ms
 
-    collectionPeriodM6Nr-Type:
+    collectionPeriodM6NR-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.34.
       type: string
       enum:
@@ -711,7 +713,7 @@ components:
         - 12min
         - 30min
 
-    collectionPeriodM7Nr-Type:
+    collectionPeriodM7NR-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.35.
       type: integer
       minimum: 1
@@ -725,7 +727,7 @@ components:
         - A2_EVENT
 
     eventThreshold-Type:
-      description: See details in 3GPP TS 32.422 clause 5.10.7, 5.10.7a, 5.10.13 and 5.10.14.
+      description: See details in 3GPP TS 32.422 clause 5.10.7 (LTE/NR Event A2 RSRP, RSRQ, SINR), 5.10.13 (UMTS Event 1f) and 5.10.14 (UMTS Event 1i).
       type: object
       properties:
         EventThresholdRSRP:
@@ -744,6 +746,10 @@ components:
           - type: integer
             minimum: 0
             maximum: 127
+        EventThresholdSINR:
+          type: integer
+          minimum: 0
+          maximum: 127
         EventThreshold1F:
           type: object
           properties:
@@ -872,7 +878,7 @@ components:
               - INFINITY
 
     eventThresholdL1-Type:
-      description: See details in 3GPP TS 32.422 clause 5.10.X.
+      description: See details in 3GPP TS 32.422 clause 5.10.36.
       type: object
       properties:
             RSRP:
@@ -885,13 +891,13 @@ components:
               maximum: 127
     
     hysteresisL1-Type:
-      description: See details in 3GPP TS 32.422 clause 5.10.Y.
+      description: See details in 3GPP TS 32.422 clause 5.10.37.
       type: integer
       minimum: 0
       maximum: 30
     
     timeToTriggerL1-Type:
-      description: See details in 3GPP TS 32.422 clause 5.10.Z.
+      description: See details in 3GPP TS 32.422 clause 5.10.38.
       type: string
       enum:
         - 0ms
@@ -911,7 +917,7 @@ components:
         - 2560ms
         - 5120ms
 
-    measurementPeriodLte-Type:
+    measurementPeriodLTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.23.
       type: string
       enum:
@@ -921,7 +927,7 @@ components:
         - 10240ms
         - 1min
 
-    measurementPeriodUmts-Type:
+    measurementPeriodUMTS-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.22.
       type: string
       enum:
@@ -947,8 +953,8 @@ components:
         - CPICH_RSCP
         - PathLoss
 
-    eventThresholdUphUmts-Type:
-      description: See details in 3GPP TS 32.422 clause 5.10.A.
+    eventThresholdUphUMTS-Type:
+      description: See details in 3GPP TS 32.422 clause 5.10.39.
       type: integer
       minimum: 0
       maximum: 31
@@ -963,9 +969,6 @@ components:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc'
           mnc:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc'
-        required:
-          - mcc
-          - mnc
       maxItems: 16
 
     positioningMethod-Type:
@@ -1299,26 +1302,26 @@ components:
           $ref: '#/components/schemas/reportInterval-Type'
         eventThreshold:
           $ref: '#/components/schemas/eventThreshold-Type'
-        collectionPeriodRrmLte:
-          $ref: '#/components/schemas/collectionPeriodRrmLte-Type'
-        collectionPeriodM6Lte:
-          $ref: '#/components/schemas/collectionPeriodM6Lte-Type'
-        collectionPeriodM7Lte:
-          $ref: '#/components/schemas/collectionPeriodM7Lte-Type'
-        collectionPeriodRrmUmts:
-          $ref: '#/components/schemas/collectionPeriodRrmUmts-Type'
-        collectionPeriodRrmNr:
-          $ref: '#/components/schemas/collectionPeriodRrmNr-Type'
-        collectionPeriodM6Nr:
-          $ref: '#/components/schemas/collectionPeriodM6Nr-Type'
-        collectionPeriodM7Nr:
-          $ref: '#/components/schemas/collectionPeriodM7Nr-Type'
-        eventThresholdUphUmts:
-          $ref: '#/components/schemas/eventThresholdUphUmts-Type'
-        measurementPeriodUmts:
-          $ref: '#/components/schemas/measurementPeriodUmts-Type'
-        measurementPeriodLte:
-          $ref: '#/components/schemas/measurementPeriodLte-Type'
+        collectionPeriodRRMLTE:
+          $ref: '#/components/schemas/collectionPeriodRRMLTE-Type'
+        collectionPeriodM6LTE:
+          $ref: '#/components/schemas/collectionPeriodM6LTE-Type'
+        collectionPeriodM7LTE:
+          $ref: '#/components/schemas/collectionPeriodM7LTE-Type'
+        collectionPeriodRRMUMTS:
+          $ref: '#/components/schemas/collectionPeriodRRMUMTS-Type'
+        collectionPeriodRRMNR:
+          $ref: '#/components/schemas/collectionPeriodRRMNR-Type'
+        collectionPeriodM6NR:
+          $ref: '#/components/schemas/collectionPeriodM6NR-Type'
+        collectionPeriodM7NR:
+          $ref: '#/components/schemas/collectionPeriodM7NR-Type'
+        eventThresholdUphUMTS:
+          $ref: '#/components/schemas/eventThresholdUphUMTS-Type'
+        measurementPeriodUMTS:
+          $ref: '#/components/schemas/measurementPeriodUMTS-Type'
+        measurementPeriodLTE:
+          $ref: '#/components/schemas/measurementPeriodLTE-Type'
         measurementQuantity:
           $ref: '#/components/schemas/measurementQuantity-Type'
         beamLevelMeasurement:
@@ -1348,6 +1351,7 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/MbsfnArea'
+          maxItems: 8
         reportType:
           $ref: '#/components/schemas/reportType-Type'
         plmnList:
@@ -1355,7 +1359,10 @@ components:
         eventListForEventTriggeredMeasurement:
           $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type'
         areaConfigurationForNeighCell:
-          $ref: '#/components/schemas/AreaConfig'
+          type: array
+          items:
+            $ref: '#/components/schemas/AreaConfig'
+          maxItems: 32
         nPNIdentityList:
           type: array
           items: