diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml
index 366a2fde853b090391382501e197739b8e1f7bb2..9ac1707fa02a0e2646b660a88dc4902a3c2182e8 100755
--- a/OpenAPI/TS28536_CoslaNrm.yaml
+++ b/OpenAPI/TS28536_CoslaNrm.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.1
 
 info:
   title: coslaNrm
-  version: 17.3.0
+  version: 17.4.0
   description: >-
     OAS 3.0.1 specification of the Cosla NRM
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -182,12 +182,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/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index ff66e7b951fa409984eee9c8256c51aac2bc95a7..a3eccf6b661b4b91bf49dd91b9b959ec6d9775f9 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: 17.15.0
+  version: 17.16.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:
@@ -198,6 +206,8 @@ components:
       properties:
         nfInstanceID:
           type: string
+        interPlmnFqdn:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
         nfType:
           $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
         heartbeatTimer:
@@ -763,8 +773,6 @@ components:
                       $ref: '#/components/schemas/AmfIdentifier'
                     sBIFqdn:
                       type: string
-                    interPlmnFQDN:
-                      type: string
                     taiList:
                       $ref: '#/components/schemas/TaiList'
                     taiRangeList:
@@ -816,10 +824,10 @@ components:
               $ref: '#/components/schemas/EP_N22-Multiple'
             EP_N26:
               $ref: '#/components/schemas/EP_N26-Multiple'
-            EP_NLS:
-              $ref: '#/components/schemas/EP_NLS-Multiple'
-            EP_NLG:
-              $ref: '#/components/schemas/EP_NLG-Multiple'
+            EP_NL1:
+              $ref: '#/components/schemas/EP_NL1-Multiple'
+            EP_NL2:
+              $ref: '#/components/schemas/EP_NL2-Multiple'
     AmfSet-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1235,8 +1243,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'
@@ -1954,7 +1962,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
@@ -1968,7 +1976,7 @@ components:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                     remoteAddress:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
-    EP_NLG-Single:
+    EP_NL2-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
         - type: object
@@ -2460,14 +2468,14 @@ 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'
-    EP_NLG-Multiple:
+        $ref: '#/components/schemas/EP_NL1-Single'
+    EP_NL2-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/EP_NLG-Single'
+        $ref: '#/components/schemas/EP_NL2-Single'
     EP_N60-Multiple:
       type: array
       items:
@@ -2586,8 +2594,8 @@ 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_NLG-Single'
+       - $ref: '#/components/schemas/EP_NL1-Single'
+       - $ref: '#/components/schemas/EP_NL2-Single'
        - $ref: '#/components/schemas/Configurable5QISet-Single'
        - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
        - $ref: '#/components/schemas/PredefinedPccRuleSet-Single'
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 6d087b7f67d4763fafbab058dd0d2c9d581a1dee..d559e6a293d386bd511904fa46c39a8162cfd03a 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: NR NRM
-  version: 17.15.0
+  version: 17.16.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -882,7 +882,10 @@ components:
               $ref: '#/components/schemas/DMROFunction-Single'
             DLBOFunction:
               $ref: '#/components/schemas/DLBOFunction-Single'
-
+            NRNetwork:
+              $ref: '#/components/schemas/NRNetwork-Single'
+            EUtranNetwork:  
+              $ref: '#/components/schemas/EUtraNetwork-Single'
     NrCellCu-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -984,9 +987,9 @@ components:
                       items:
                         $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     rimRSMonitoringStartTime:
-                      type: string
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                     rimRSMonitoringStopTime:
-                      type: string
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                     rimRSMonitoringWindowDuration:
                       type: integer
                     rimRSMonitoringWindowStartingOffset:
@@ -1565,6 +1568,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'
@@ -1587,7 +1599,7 @@ components:
             EP_F1U:
               $ref: '#/components/schemas/EP_F1U-Multiple'
             EP_XnU:
-              $ref: '#/components/schemas/EP_XnU-Multiple'
+              $ref: '#/components/schemas/EP_XnU-Multiple'   
     ExternalGnbCuCpFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1635,6 +1647,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'
@@ -2041,6 +2062,10 @@ 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 49f37c53deafc59441198c666e62cf3835b23361..52728c11a2cffebb7c31e69a3b9bea5f1e794129 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Generic NRM
-  version: 17.10.0
+  version: 17.11.0
   description: >-
     OAS 3.0.1 definition of the Generic NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -751,9 +751,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.
@@ -782,10 +779,6 @@ components:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc'
         traceId:
           type: string
-      required:
-        - mcc
-        - mnc
-        - traceId
 
     traceReportingFormat-Type:
       type: string
@@ -814,13 +807,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
@@ -1073,7 +1063,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:
@@ -1092,6 +1082,10 @@ components:
           - type: integer
             minimum: 0
             maximum: 127
+        EventThresholdSINR:
+          type: integer
+          minimum: 0
+          maximum: 127
         EventThreshold1F:
           type: object
           properties:
@@ -1220,7 +1214,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:
@@ -1233,13 +1227,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
@@ -1296,7 +1290,7 @@ components:
         - PathLoss
 
     eventThresholdUphUMTS-Type:
-      description: See details in 3GPP TS 32.422 clause 5.10.A.
+      description: See details in 3GPP TS 32.422 clause 5.10.39.
       type: integer
       minimum: 0
       maximum: 31
@@ -1311,9 +1305,6 @@ components:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc'
           mnc:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc'
-        required:
-          - mcc
-          - mnc
       maxItems: 16
 
     positioningMethod-Type:
@@ -1682,7 +1673,10 @@ components:
         anonymizationOfMDTData:
           $ref: '#/components/schemas/anonymizationOfMDTData-Type'
         areaConfigurationForNeighCell:
-          $ref: '#/components/schemas/AreaConfig'
+          type: array
+          items:
+            $ref: '#/components/schemas/AreaConfig'
+          maxItems: 32
         areaScope:
           type: array
           items:
@@ -1719,10 +1713,11 @@ components:
           $ref: '#/components/schemas/hysteresisL1-Type'
         timeToTriggerL1:
           $ref: '#/components/schemas/timeToTriggerL1-Type'
-        mBSFNAreaList:
+        mbsfnAreaList:
           type: array
           items:
             $ref: '#/components/schemas/MbsfnArea'
+          maxItems: 8
         measurementPeriodLTE:
           $ref: '#/components/schemas/measurementPeriodLTE-Type'
         measurementPeriodUMTS: