diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml
index 9afbd454f852d751f8db5a45a5675c0a8a4e8a2e..fd61fca9d49f22ec6ead16a160b115f712e4ef0b 100644
--- a/OpenAPI/5gcNrm.yaml
+++ b/OpenAPI/5gcNrm.yaml
@@ -1,13 +1,13 @@
 openapi: 3.0.1
 info:
   title: 3GPP 5GC NRM
-  version: 16.6.0
+  version: 17.3.0
   description: >-
     OAS 3.0.1 specification of the 5GC NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
-  description: 3GPP TS 28.541 V16.6.0; 5G NRM, 5GC NRM
+  description: 3GPP TS 28.541; 5G NRM, 5GC NRM
   url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/
 paths: {}
 components:
@@ -243,6 +243,20 @@ components:
             type: integer
         dscp:
           type: integer
+    NetworkSliceInfo:
+      type: object
+      properties:
+        sNSSAI:
+          $ref: 'nrNrm.yaml#/components/schemas/Snssai'
+        cNSIId:
+          $ref: '#/components/schemas/CNSIId'
+        networkSliceRef:
+          $ref: 'genericNrm.yaml#/components/schemas/DnList'
+    NetworkSliceInfoList:
+      type: array
+      items:
+        $ref: '#/components/schemas/NetworkSliceInfo'
+
 
     PacketErrorRate:
       type: object
@@ -436,6 +450,39 @@ components:
         tscaiInputUl:
           $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer'
 
+    SnssaiInfo:
+      type: object
+      properties:
+        plmnInfo:
+          $ref: 'nrNrm.yaml#/components/schemas/PlmnInfo'
+        administrativeState:
+          $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState'
+
+    NsacfInfoSnssai:
+      type: object
+      properties:
+        SnssaiInfo:
+          $ref: '#/components/schemas/SnssaiInfo'
+        isSubjectToNsac:
+          type: boolean
+        maxNumberofUEs:
+          type: integer
+        eACMode:
+          type: string
+          enum:
+            - INACTIVE
+            - ACTIVE
+        activeEacThreshhold:
+          type: integer
+        deactiveEacThreshhold:
+          type: integer
+        numberofUEs:
+          type: integer
+        uEIdList:
+          type: array
+          items:
+            type: string
+         
 
 #-------- Definition of concrete IOCs --------------------------------------------
 
@@ -1018,6 +1065,9 @@ components:
                       $ref: '#/components/schemas/ManagedNFProfile'
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
+                    networkSliceInfoList:
+                      $ref: '#/components/schemas/NetworkSliceInfoList'
+                      
     ScpFunction-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -1057,6 +1107,28 @@ components:
                       type: boolean
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
 
+    NsacfFunction-Single:
+      allOf:
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - type: object
+          properties:
+            attributes:
+              allOf:
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - type: object
+                  properties:
+                    managedNFProfile:
+                      $ref: '#/components/schemas/ManagedNFProfile'
+                    nsacfInfoSnssai:
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/NsacfInfoSnssai'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - type: object
+          properties:
+            EP_N60:
+              $ref: '#/components/schemas/EP_N60-Multiple'
+
     ExternalAmfFunction-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -1536,6 +1608,21 @@ components:
                     remoteAddress:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
 
+    EP_N60-Single:
+      allOf:
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - type: object
+          properties:
+            attributes:
+              allOf:
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - type: object
+                  properties:
+                    localAddress:
+                      $ref: 'nrNrm.yaml#/components/schemas/LocalAddress'
+                    remoteAddress:
+                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
+
     FiveQiDscpMappingSet-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -1749,6 +1836,11 @@ components:
       items:
         $ref: '#/components/schemas/NefFunction-Single'
 
+    NsacfFunction-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/NsacfFunction-Single'
+
     ExternalAmfFunction-Multiple:
       type: array
       items:
@@ -1895,6 +1987,11 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/EP_NLG-Single'
+    EP_N60-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EP_N60-Single'
+
     Configurable5QISet-Multiple:
       type: array
       items:
@@ -1930,6 +2027,7 @@ components:
        - $ref: '#/components/schemas/NwdafFunction-Single'
        - $ref: '#/components/schemas/ScpFunction-Single'
        - $ref: '#/components/schemas/NefFunction-Single'
+       - $ref: '#/components/schemas/NsacfFunction-Single'
 
        - $ref: '#/components/schemas/ExternalAmfFunction-Single'
        - $ref: '#/components/schemas/ExternalNrfFunction-Single'
@@ -1967,6 +2065,7 @@ components:
 
        - $ref: '#/components/schemas/EP_N31-Single'
        - $ref: '#/components/schemas/EP_N31-Single'
+       - $ref: '#/components/schemas/EP_N60-Single'
 
        - $ref: '#/components/schemas/EP_S5C-Single'
        - $ref: '#/components/schemas/EP_S5U-Single'
diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml
index 6862dff42fd7ae3bbcde3adddd2ab364476aba09..e6a0ef13af2190af819c4b75ec31fa458af04558 100644
--- a/OpenAPI/coslaNrm.yaml
+++ b/OpenAPI/coslaNrm.yaml
@@ -43,6 +43,18 @@ components:
         - FULFILLED
         - NOT_FULFILLED
 
+    AssuranceTargetStatusObserved:
+      type: string
+      enum:
+        - FULFILLED
+        - NOT_FULFILLED
+
+    AssuranceTargetStatusPredicted:
+      type: string
+      enum:
+        - FULFILLED
+        - NOT_FULFILLED
+        
     AssuranceTarget:
       type: object
       properties:
@@ -50,6 +62,10 @@ components:
           type: string
         assuranceTargetValue:
           type: string
+        assuranceTargetStatusObserved:
+          $ref: '#/components/schemas/AssuranceTargetStatusObserved'
+        assuranceTargetStatusPredicted:
+          $ref: '#/components/schemas/AssuranceTargetStatusPredicted'
          
     AssuranceTargetList:
       type: array
diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml
index 6fffb075d1254cb3282d3b1c3ae4613721355d2f..b1a462f33a37cfa7a1468291853a11061d616192 100644
--- a/OpenAPI/nrNrm.yaml
+++ b/OpenAPI/nrNrm.yaml
@@ -1,13 +1,13 @@
 openapi: 3.0.1
 info:
   title: NR NRM
-  version: 16.6.0
+  version: 17.3.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
-  description: 3GPP TS 28.541 V16.6.0; 5G NRM, NR NRM
+  description: 3GPP TS 28.541; 5G NRM, NR NRM
   url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/
 paths: {}
 components:
@@ -1339,6 +1339,20 @@ components:
                   properties:
                     cesSwitch:
                       type: boolean
+                    intraRatEsActivationOriginalCellLoadParameters:
+                      $ref: "#/components/schemas/IntraRatEsActivationOriginalCellLoadParameters"
+                    intraRatEsActivationCandidateCellsLoadParameters:
+                      $ref: "#/components/schemas/IntraRatEsActivationCandidateCellsLoadParameters"
+                    intraRatEsDeactivationCandidateCellsLoadParameters:
+                      $ref: "#/components/schemas/IntraRatEsDeactivationCandidateCellsLoadParameters"
+                    esNotAllowedTimePeriod:
+                      $ref: "#/components/schemas/EsNotAllowedTimePeriod"
+                    interRatEsActivationOriginalCellParameters:
+                      $ref: "#/components/schemas/IntraRatEsActivationOriginalCellLoadParameters"
+                    interRatEsActivationCandidateCellParameters:
+                      $ref: "#/components/schemas/IntraRatEsActivationOriginalCellLoadParameters"
+                    interRatEsDeactivationCandidateCellParameters:
+                      $ref: "#/components/schemas/IntraRatEsActivationOriginalCellLoadParameters"
                     energySavingControl:
                       type: string
                       enum:
diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml
index 1a2d7467759185913530e46c440af8618892a202..6e12a4d8b30872e2d823690ca657ce8379395e3b 100644
--- a/OpenAPI/sliceNrm.yaml
+++ b/OpenAPI/sliceNrm.yaml
@@ -1,13 +1,13 @@
 openapi: 3.0.1
 info:
   title: Slice NRM
-  version: 17.2.0
+  version: 17.3.0
   description: >-
     OAS 3.0.1 specification of the Slice NRM
     @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
-  description: 3GPP TS 28.541 V17.2.0; 5G NRM, Slice NRM
+  description: 3GPP TS 28.541; 5G NRM, Slice NRM
   url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/
 paths: {}
 components:
@@ -75,49 +75,6 @@ components:
         - TWO
         - THREE
         - FOUR
-
-    PerfReqEmbb:
-      type: object
-      properties:
-        expDataRateDL:
-          type: number
-        expDataRateUL:
-          type: number
-        areaTrafficCapDL:
-          type: number
-        areaTrafficCapUL:
-          type: number
-        userDensity:
-          type: number
-        activityFactor:
-          type: number
-    PerfReqEmbbList:
-      type: array
-      items:
-        $ref: '#/components/schemas/PerfReqEmbb'
-    PerfReqUrllc:
-      type: object
-      properties:
-        cSAvailabilityTarget:
-          type: number
-        cSReliabilityMeanTime:
-          type: string
-        expDataRate:
-          type: number
-        msgSizeByte:
-          type: string
-        transferIntervalTarget:
-          type: string
-        survivalTime:
-          type: string
-    PerfReqUrllcList:
-      type: array
-      items:
-        $ref: '#/components/schemas/PerfReqUrllc'
-    PerfReq:
-      oneOf:
-        - $ref: '#/components/schemas/PerfReqEmbbList'
-        - $ref: '#/components/schemas/PerfReqUrllcList'
     Category:
       type: string
       enum:
@@ -166,7 +123,7 @@ components:
           $ref: '#/components/schemas/Support'
         periodicityList:
           type: string
-    DLThptPerSlice:
+    XLThpt:
       type: object
       properties:
         servAttrCom:
@@ -175,61 +132,6 @@ components:
           $ref: '#/components/schemas/Float'
         maxThpt:
           $ref: '#/components/schemas/Float'
-    DLThptPerUE:
-      type: object
-      properties:
-        servAttrCom:
-          $ref: '#/components/schemas/ServAttrCom'
-        guaThpt:
-          $ref: '#/components/schemas/Float'
-        maxThpt:
-          $ref: '#/components/schemas/Float'
-    ULThptPerSlice:
-      type: object
-      properties:
-        servAttrCom:
-          $ref: '#/components/schemas/ServAttrCom'
-        guaThpt:
-          $ref: '#/components/schemas/Float'
-        maxThpt:
-          $ref: '#/components/schemas/Float'
-    ULThptPerUE:
-      type: object
-      properties:
-        servAttrCom:
-          $ref: '#/components/schemas/ServAttrCom'
-        guaThpt:
-          $ref: '#/components/schemas/Float'
-        maxThpt:
-          $ref: '#/components/schemas/Float'
-    DLThptPerSliceSubnet:
-      type: object
-      properties:
-        guaThpt:
-          $ref: '#/components/schemas/Float'
-        maxThpt:
-          $ref: '#/components/schemas/Float'
-    DLThptPerUEPerSubnet:
-      type: object
-      properties:
-        guaThpt:
-          $ref: '#/components/schemas/Float'
-        maxThpt:
-          $ref: '#/components/schemas/Float'
-    ULThptPerSliceSubnet:
-      type: object
-      properties:
-        guaThpt:
-          $ref: '#/components/schemas/Float'
-        maxThpt:
-          $ref: '#/components/schemas/Float'
-    ULThptPerUEPerSubnet:
-      type: object
-      properties:
-        guaThpt:
-          $ref: '#/components/schemas/Float'
-        maxThpt:
-          $ref: '#/components/schemas/Float'
     MaxPktSize:
       type: object
       properties:
@@ -267,6 +169,13 @@ components:
           $ref: '#/components/schemas/SynAvailability'
         accuracy:
           $ref: '#/components/schemas/Float'
+    SynchronicityRANSubnet:
+      type: object
+      properties:
+        availability:
+          $ref: '#/components/schemas/SynAvailability'
+        accuracy:
+          $ref: '#/components/schemas/Float'
     Positioning:
       type: object
       properties:
@@ -278,6 +187,15 @@ components:
           $ref: '#/components/schemas/Predictionfrequency'
         accuracy:
           $ref: '#/components/schemas/Float'
+    PositioningRANSubnet:
+      type: object
+      properties:
+        availability:
+          $ref: '#/components/schemas/PositioningAvailability'
+        predictionfrequency:
+          $ref: '#/components/schemas/Predictionfrequency'
+        accuracy:
+          $ref: '#/components/schemas/Float'     
     UserMgmtOpen:
       type: object
       properties:
@@ -306,6 +224,32 @@ components:
           type: string
         nsName:
           type: string
+    EmbbEEPerfReq:
+      type: integer
+    UrllcEEPerfReq:
+      type: integer
+    MIoTEEPerfReq:
+      type: object
+      properties:
+        KpiType:
+          type: string
+          enum:
+            - MAXREGSUBS
+            - MEANACTIVEUES
+        Req:
+          type: integer
+    EEPerfReq:
+      oneOf:
+        - $ref: '#/components/schemas/EmbbEEPerfReq'
+        - $ref: '#/components/schemas/UrllcEEPerfReq'
+        - $ref: '#/components/schemas/MIoTEEPerfReq'
+    EnergyEfficiency:
+      type: object
+      properties:
+        servAttrCom:
+          $ref: '#/components/schemas/ServAttrCom'
+        performance:
+          $ref: '#/components/schemas/EEPerfReq'      
     CNSliceSubnetProfile:
       type: object
       properties:
@@ -314,27 +258,39 @@ components:
         latency:
           type: integer
         dLThptPerSliceSubnet:
-          $ref: '#/components/schemas/DLThptPerSliceSubnet'
-        dLThptPerUEPerSubnet:
-          $ref: '#/components/schemas/DLThptPerUEPerSubnet'
+          $ref: '#/components/schemas/XLThpt'
+        dLThptPerUE:
+          $ref: '#/components/schemas/XLThpt'
         uLThptPerSliceSubnet:
-          $ref: '#/components/schemas/ULThptPerSliceSubnet'
-        uLThptPerUEPerSubnet:
-          $ref: '#/components/schemas/ULThptPerUEPerSubnet'
+          $ref: '#/components/schemas/XLThpt'
+        uLThptPerUE:
+          $ref: '#/components/schemas/XLThpt'
         maxNumberOfPDUSessions:
           type: integer
+        coverageAreaTAList:
+          type: integer
+        resourceSharingLevel:
+          $ref: '#/components/schemas/SharingLevel'
         maxPktSize:
           type: integer
         delayTolerance:
           $ref: '#/components/schemas/DelayTolerance'
+        synchronicity:
+          $ref: '#/components/schemas/SynchronicityRANSubnet'
         sliceSimultaneousUse:
           $ref: '#/components/schemas/SliceSimultaneousUse'
+        reliability:
+          type: string
+        energyEfficiency:
+          type: integer 
+        deterministicComm:
+          $ref: '#/components/schemas/DeterministicComm'
     RANSliceSubnetProfile:
       type: object
       properties:
         coverageAreaTAList:
           type: integer
-        MobilityLevel:
+        uEMobilityLevel:
           $ref: '#/components/schemas/MobilityLevel'
         resourceSharingLevel:
           $ref: '#/components/schemas/SharingLevel'
@@ -342,10 +298,10 @@ components:
           type: integer
         activityFactor:
           type: integer
-        dLThptPerUEPerSubnet:
-          $ref: '#/components/schemas/ULThptPerUEPerSubnet'
-        uLThptPerUEPerSubnet:
-          $ref: '#/components/schemas/ULThptPerUEPerSubnet'
+        dLThptPerUE:
+          $ref: '#/components/schemas/XLThpt'
+        uLThptPerUE:
+          $ref: '#/components/schemas/XLThpt'
         uESpeed:
           type: integer
         reliability:
@@ -356,8 +312,20 @@ components:
           type: integer
         delayTolerance:
           $ref: '#/components/schemas/DelayTolerance'
+        positioning:
+          $ref: '#/components/schemas/PositioningRANSubnet'
         sliceSimultaneousUse:
           $ref: '#/components/schemas/SliceSimultaneousUse'
+        energyEfficiency:
+          type: integer
+        termDensity:
+          $ref: '#/components/schemas/TermDensity'
+        survivalTime:
+          type: string
+        synchronicity:
+          $ref: '#/components/schemas/SynchronicityRANSubnet'
+        deterministicComm:
+          $ref: '#/components/schemas/DeterministicComm'
     TopSliceSubnetProfile:
       type: object
       properties:
@@ -368,19 +336,48 @@ components:
         maxNumberofUEs:
           type: integer
         dLThptPerSliceSubnet:
-          $ref: '#/components/schemas/DLThptPerSliceSubnet'
-        dLThptPerUEPerSubnet:
-          $ref: '#/components/schemas/DLThptPerUEPerSubnet'
+          $ref: '#/components/schemas/XLThpt'
+        dLThptPerUE:
+          $ref: '#/components/schemas/XLThpt'
         uLThptPerSliceSubnet:
-          $ref: '#/components/schemas/ULThptPerSliceSubnet'
-        uLThptPerUEPerSubnet:
-          $ref: '#/components/schemas/ULThptPerUEPerSubnet'
+          $ref: '#/components/schemas/XLThpt'
+        uLThptPerUE:
+          $ref: '#/components/schemas/XLThpt'
         maxPktSize:
           type: integer
-        delayTolerance:
-          $ref: '#/components/schemas/DelayTolerance'
+        maxNumberOfPDUSessions:
+          type: integer
         sliceSimultaneousUse:
           $ref: '#/components/schemas/SliceSimultaneousUse'
+        energyEfficiency:
+          type: integer
+        synchronicity:
+          $ref: '#/components/schemas/Synchronicity'
+        delayTolerance:
+          $ref: '#/components/schemas/DelayTolerance'
+        positioning:
+          $ref: '#/components/schemas/Positioning'  
+        termDensity:
+          $ref: '#/components/schemas/TermDensity'
+        activityFactor:
+          type: integer
+        coverageAreaTAList:
+          type: integer
+        resourceSharingLevel:
+          $ref: '#/components/schemas/SharingLevel'
+        uEMobilityLevel:
+          $ref: '#/components/schemas/MobilityLevel'
+        uESpeed:
+          type: integer
+        reliability:
+          type: string
+        serviceType:
+          $ref: '#/components/schemas/ServiceType'
+        deterministicComm:
+          $ref: '#/components/schemas/DeterministicComm'
+        survivalTime:
+          type: string
+
     ServiceProfile:
       type: object
       properties:
@@ -405,13 +402,13 @@ components:
           deterministicComm:
             $ref: '#/components/schemas/DeterministicComm'
           dLThptPerSlice:
-            $ref: '#/components/schemas/DLThptPerSlice'
+            $ref: '#/components/schemas/XLThpt'
           dLThptPerUE:
-            $ref: '#/components/schemas/DLThptPerUE'
+            $ref: '#/components/schemas/XLThpt'
           uLThptPerSlice:
-            $ref: '#/components/schemas/ULThptPerSlice'
+            $ref: '#/components/schemas/XLThpt'
           uLThptPerUE:
-            $ref: '#/components/schemas/ULThptPerUE'
+            $ref: '#/components/schemas/XLThpt'
           maxPktSize:
             $ref: '#/components/schemas/MaxPktSize'
           maxNumberofPDUSessions:
@@ -448,7 +445,8 @@ components:
             type: string
           sliceSimultaneousUse:
             $ref: '#/components/schemas/SliceSimultaneousUse'
-
+          energyEfficiency:
+            $ref: '#/components/schemas/EnergyEfficiency'
     SliceProfile:
       type: object
       properties:
@@ -456,8 +454,6 @@ components:
             type: string
           plmnInfoList:
             $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList'
-          perfReq:
-            $ref: '#/components/schemas/PerfReq'
           cNSliceSubnetProfile:
             $ref: '#/components/schemas/CNSliceSubnetProfile'
           rANSliceSubnetProfile:
@@ -508,7 +504,6 @@ components:
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr'
                 - type: object
                   properties:
                     networkSliceSubnetRef:
@@ -527,7 +522,6 @@ components:
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr'
                 - type: object
                   properties:
                     managedFunctionRefList: