diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml
index 64280fa3636c0e221adab126bb94ec349ea5cb30..9afbd454f852d751f8db5a45a5675c0a8a4e8a2e 100644
--- a/OpenAPI/5gcNrm.yaml
+++ b/OpenAPI/5gcNrm.yaml
@@ -306,15 +306,15 @@ components:
         fiveQIValue:
           type: integer
         maxbrUl:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
         maxbrDl:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
         gbrUl:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
         gbrDl:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
         arp:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/Arp'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/Arp'
         qosNotificationControl:
           type: boolean
         reflectiveQos:
@@ -324,41 +324,44 @@ components:
         sharingKeyUl:
           type: string
         maxPacketLossRateDl:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/PacketLossRateRm'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/PacketLossRateRm'
         maxPacketLossRateUl:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/PacketLossRateRm'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/PacketLossRateRm'
         extMaxDataBurstVol:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/ExtMaxDataBurstVolRm'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/ExtMaxDataBurstVolRm'
+
     QosDataList:
       type: array
       items:
         $ref: '#/components/schemas/QosData'
+
     SteeringMode:
       type: object
       properties:
         steerModeValue:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/SteerModeValue'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/SteerModeValue'
         active:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/AccessType'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/AccessType'
         standby:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/AccessTypeRm'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/AccessTypeRm'
         threeGLoad:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/Uinteger'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/Uinteger'
         prioAcc:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/AccessType'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/AccessType'
+
     TrafficControlData:
       type: object
       properties:
         tcId:
           type: string
         flowStatus:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/FlowStatus'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/FlowStatus'
         redirectInfo:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/RedirectInformation'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/RedirectInformation'
         addRedirectInfo:
           type: array
           items:
-            $ref: '/rep/all/5G_APIs/raw/master/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/RedirectInformation'
+            $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/RedirectInformation'
           minItems: 1
         muteNotif:
           type: boolean
@@ -371,23 +374,25 @@ components:
         routeToLocs:
           type: array
           items:
-            $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/RouteToLocation'
+            $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/RouteToLocation'
         traffCorreInd:
           type: boolean
         upPathChgEvent:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/UpPathChgEvent'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/UpPathChgEvent'
         steerFun:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/SteeringFunctionality'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/SteeringFunctionality'
         steerModeDl:
           $ref: '#/components/schemas/SteeringMode'
         steerModeUl:
           $ref: '#/components/schemas/SteeringMode'
         mulAccCtrl:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/MulticastAccessControl'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/MulticastAccessControl'
+
     TrafficControlDataList:
       type: array
       items:
         $ref: '#/components/schemas/TrafficControlData'
+
     PccRule:
       type: object
       properties:
@@ -397,17 +402,17 @@ components:
         flowInfoList:
           type: array
           items:
-            $ref: '/rep/all/5G_APIs/raw/master/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/FlowInformation'
+            $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/FlowInformation'
         applicationId:
           type: string
         appDescriptor:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/ApplicationDescriptor'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/ApplicationDescriptor'
         contentVersion:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/ContentVersion'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/ContentVersion'
         precedence:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29571_CommonData.yaml#/components/schemas/Uinteger'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/Uinteger'
         afSigProtocol:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/AfSigProtocol'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/AfSigProtocol'
         isAppRelocatable:
           type: boolean
         isUeAddrPreserved:
@@ -425,11 +430,13 @@ components:
           items:
             $ref: '#/components/schemas/TrafficControlDataList'
         conditionData:
-            $ref: '/rep/all/5G_APIs/raw/master/TS29512_Npcf_SMPolicyControl#/components/schemas/ConditionData'
+            $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/ConditionData'
         tscaiInputDl:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer'
         tscaiInputUl:
-          $ref: '/rep/all/5G_APIs/raw/master/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer'
+          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer'
+
+
 #-------- Definition of concrete IOCs --------------------------------------------
 
     SubNetwork-Single:
@@ -513,6 +520,7 @@ components:
               $ref: '#/components/schemas/Configurable5QISet-Multiple'
             Dynamic5QISet:
               $ref: '#/components/schemas/Dynamic5QISet-Multiple'
+ 
     AmfFunction-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -625,9 +633,9 @@ components:
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
                     configurable5QISetRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
 
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
@@ -728,9 +736,10 @@ components:
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
                     configurable5QISetRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -746,6 +755,7 @@ components:
               $ref: '#/components/schemas/EP_Rx-Multiple'
             PredefinedPccRuleSet:
               $ref: '#/components/schemas/PredefinedPccRuleSet-Single'
+
     AusfFunction-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -1105,12 +1115,12 @@ components:
 
     EP_N2-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1119,12 +1129,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N3-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1135,12 +1145,12 @@ components:
                       $ref: 'genericNrm.yaml#/components/schemas/DnList'
     EP_N4-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1149,12 +1159,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N5-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1163,12 +1173,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N6-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1177,12 +1187,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N7-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1191,12 +1201,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N8-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1205,12 +1215,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N9-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1219,12 +1229,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N10-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1233,12 +1243,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N11-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1247,12 +1257,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N12-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1261,12 +1271,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N13-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1275,12 +1285,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N14-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1289,12 +1299,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N15-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1303,12 +1313,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N16-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1317,12 +1327,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N17-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1332,12 +1342,12 @@ components:
 
     EP_N20-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1347,12 +1357,12 @@ components:
 
     EP_N21-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1361,12 +1371,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N22-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1376,12 +1386,12 @@ components:
 
     EP_N26-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1390,12 +1400,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N27-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1406,12 +1416,12 @@ components:
 
     EP_N31-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1420,12 +1430,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N32-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     remotePlmnId:
@@ -1443,12 +1453,12 @@ components:
 
     EP_S5C-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1457,12 +1467,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_S5U-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1471,12 +1481,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_Rx-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1485,12 +1495,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_MAP_SMSC-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1499,12 +1509,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_NLS-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1513,12 +1523,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_NLG-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1528,7 +1538,7 @@ components:
 
     FiveQiDscpMappingSet-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1542,7 +1552,7 @@ components:
 
     Configurable5QISet-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1553,9 +1563,10 @@ components:
                       type: array
                       items:
                         $ref: '#/components/schemas/FiveQICharacteristics'  
+   
     Dynamic5QISet-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1566,9 +1577,10 @@ components:
                       type: array
                       items:
                         $ref: '#/components/schemas/FiveQICharacteristics'                           
+                      
     GtpUPathQoSMonitoringControl-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1605,7 +1617,7 @@ components:
 
     QFQoSMonitoringControl-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1893,75 +1905,76 @@ components:
         $ref: '#/components/schemas/Dynamic5QISet-Single'
 
 
+
 #------------ Definitions in TS 28.541 for TS 28.532 -----------------------------
 
     resources-5gcNrm:
       oneOf:
-        - $ref: '#/components/schemas/SubNetwork-Single'
-        - $ref: '#/components/schemas/ManagedElement-Single'
-        - $ref: '#/components/schemas/AmfFunction-Single'
-        - $ref: '#/components/schemas/SmfFunction-Single'
-        - $ref: '#/components/schemas/UpfFunction-Single'
-        - $ref: '#/components/schemas/N3iwfFunction-Single'
-        - $ref: '#/components/schemas/PcfFunction-Single'
-        - $ref: '#/components/schemas/AusfFunction-Single'
-        - $ref: '#/components/schemas/UdmFunction-Single'
-        - $ref: '#/components/schemas/UdrFunction-Single'
-        - $ref: '#/components/schemas/UdsfFunction-Single'
-        - $ref: '#/components/schemas/NrfFunction-Single'
-        - $ref: '#/components/schemas/NssfFunction-Single'
-        - $ref: '#/components/schemas/SmsfFunction-Single'
-        - $ref: '#/components/schemas/LmfFunction-Single'
-        - $ref: '#/components/schemas/NgeirFunction-Single'
-        - $ref: '#/components/schemas/SeppFunction-Single'
-        - $ref: '#/components/schemas/NwdafFunction-Single'
-        - $ref: '#/components/schemas/ScpFunction-Single'
-        - $ref: '#/components/schemas/NefFunction-Single'
+       - $ref: '#/components/schemas/SubNetwork-Single'
+       - $ref: '#/components/schemas/ManagedElement-Single'
+       - $ref: '#/components/schemas/AmfFunction-Single'
+       - $ref: '#/components/schemas/SmfFunction-Single'
+       - $ref: '#/components/schemas/UpfFunction-Single'
+       - $ref: '#/components/schemas/N3iwfFunction-Single'
+       - $ref: '#/components/schemas/PcfFunction-Single'
+       - $ref: '#/components/schemas/AusfFunction-Single'
+       - $ref: '#/components/schemas/UdmFunction-Single'
+       - $ref: '#/components/schemas/UdrFunction-Single'
+       - $ref: '#/components/schemas/UdsfFunction-Single'
+       - $ref: '#/components/schemas/NrfFunction-Single'
+       - $ref: '#/components/schemas/NssfFunction-Single'
+       - $ref: '#/components/schemas/SmsfFunction-Single'
+       - $ref: '#/components/schemas/LmfFunction-Single'
+       - $ref: '#/components/schemas/NgeirFunction-Single'
+       - $ref: '#/components/schemas/SeppFunction-Single'
+       - $ref: '#/components/schemas/NwdafFunction-Single'
+       - $ref: '#/components/schemas/ScpFunction-Single'
+       - $ref: '#/components/schemas/NefFunction-Single'
 
-        - $ref: '#/components/schemas/ExternalAmfFunction-Single'
-        - $ref: '#/components/schemas/ExternalNrfFunction-Single'
-        - $ref: '#/components/schemas/ExternalNssfFunction-Single'
-        - $ref: '#/components/schemas/ExternalSeppFunction-Single'
+       - $ref: '#/components/schemas/ExternalAmfFunction-Single'
+       - $ref: '#/components/schemas/ExternalNrfFunction-Single'
+       - $ref: '#/components/schemas/ExternalNssfFunction-Single'
+       - $ref: '#/components/schemas/ExternalSeppFunction-Single'
 
-        - $ref: '#/components/schemas/AmfSet-Single'
-        - $ref: '#/components/schemas/AmfRegion-Single'
-        - $ref: '#/components/schemas/QFQoSMonitoringControl-Single'
-        - $ref: '#/components/schemas/GtpUPathQoSMonitoringControl-Single'
+       - $ref: '#/components/schemas/AmfSet-Single'
+       - $ref: '#/components/schemas/AmfRegion-Single'
+       - $ref: '#/components/schemas/QFQoSMonitoringControl-Single'
+       - $ref: '#/components/schemas/GtpUPathQoSMonitoringControl-Single'
 
-        - $ref: '#/components/schemas/EP_N2-Single'
-        - $ref: '#/components/schemas/EP_N3-Single'
-        - $ref: '#/components/schemas/EP_N4-Single'
-        - $ref: '#/components/schemas/EP_N5-Single'
-        - $ref: '#/components/schemas/EP_N6-Single'
-        - $ref: '#/components/schemas/EP_N7-Single'
-        - $ref: '#/components/schemas/EP_N8-Single'
-        - $ref: '#/components/schemas/EP_N9-Single'
-        - $ref: '#/components/schemas/EP_N10-Single'
-        - $ref: '#/components/schemas/EP_N11-Single'
-        - $ref: '#/components/schemas/EP_N12-Single'
-        - $ref: '#/components/schemas/EP_N13-Single'
-        - $ref: '#/components/schemas/EP_N14-Single'
-        - $ref: '#/components/schemas/EP_N15-Single'
-        - $ref: '#/components/schemas/EP_N16-Single'
-        - $ref: '#/components/schemas/EP_N17-Single'
+       - $ref: '#/components/schemas/EP_N2-Single'
+       - $ref: '#/components/schemas/EP_N3-Single'
+       - $ref: '#/components/schemas/EP_N4-Single'
+       - $ref: '#/components/schemas/EP_N5-Single'
+       - $ref: '#/components/schemas/EP_N6-Single'
+       - $ref: '#/components/schemas/EP_N7-Single'
+       - $ref: '#/components/schemas/EP_N8-Single'
+       - $ref: '#/components/schemas/EP_N9-Single'
+       - $ref: '#/components/schemas/EP_N10-Single'
+       - $ref: '#/components/schemas/EP_N11-Single'
+       - $ref: '#/components/schemas/EP_N12-Single'
+       - $ref: '#/components/schemas/EP_N13-Single'
+       - $ref: '#/components/schemas/EP_N14-Single'
+       - $ref: '#/components/schemas/EP_N15-Single'
+       - $ref: '#/components/schemas/EP_N16-Single'
+       - $ref: '#/components/schemas/EP_N17-Single'
 
-        - $ref: '#/components/schemas/EP_N20-Single'
-        - $ref: '#/components/schemas/EP_N21-Single'
-        - $ref: '#/components/schemas/EP_N22-Single'
+       - $ref: '#/components/schemas/EP_N20-Single'
+       - $ref: '#/components/schemas/EP_N21-Single'
+       - $ref: '#/components/schemas/EP_N22-Single'
 
-        - $ref: '#/components/schemas/EP_N26-Single'
-        - $ref: '#/components/schemas/EP_N27-Single'
+       - $ref: '#/components/schemas/EP_N26-Single'
+       - $ref: '#/components/schemas/EP_N27-Single'
 
-        - $ref: '#/components/schemas/EP_N31-Single'
-        - $ref: '#/components/schemas/EP_N31-Single'
+       - $ref: '#/components/schemas/EP_N31-Single'
+       - $ref: '#/components/schemas/EP_N31-Single'
 
-        - $ref: '#/components/schemas/EP_S5C-Single'
-        - $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/Configurable5QISet-Single'
-        - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
-        - $ref: '#/components/schemas/PredefinedPccRuleSet-Single'
-        - $ref: '#/components/schemas/Dynamic5QISet-Single'
+       - $ref: '#/components/schemas/EP_S5C-Single'
+       - $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/Configurable5QISet-Single'
+       - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
+       - $ref: '#/components/schemas/PredefinedPccRuleSet-Single'
+       - $ref: '#/components/schemas/Dynamic5QISet-Single'
diff --git a/OpenAPI/PerDataFileReportMnS.yaml b/OpenAPI/PerDataFileReportMnS.yaml
index dfacc14f8cbe8e923eda511cf2a0efd4bac081e9..83fd77acb7ff591a51a20ba0a1c1473b9a3b5376 100644
--- a/OpenAPI/PerDataFileReportMnS.yaml
+++ b/OpenAPI/PerDataFileReportMnS.yaml
@@ -1,272 +1,13 @@
 openapi: 3.0.1
 info:
-  title: TS 28.532 Performance data file reporting Service
-  version: 16.4.0
+  title: TS 28.532 File data reporting Service
+  version: 16.6.0
   description: >-
-    OAS 3.0.1 specification of the Performance data file reporting Management Service © 2020,
+    OAS 3.0.1 specification of the File data reporting Management Service © 2020,
     3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All
     rights reserved.
 externalDocs:
-  description: 3GPP TS 28.532 V16.4.0; Generic management services
+  description: 3GPP TS 28.532 V16.5.0; Generic management services
   url: 'http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/'
-servers:
-  - url: '{MnSRoot}/PerfDataFileReportMnS/v1640'
-    variables:
-      MnSRoot:
-        description: See subclause 4.4 of TS 32.158
-        default: http://example.com/3GPPManagement
-paths:
-  /Files:
-    get:
-      summary: Read resources of information of available files
-      description: 'With HTTP GET, resources of information of available files are read. The resources to be read are identified with the path component (base resource) and the query component (managementDataType, beginTime and endTime) of the URI. The fields query component allows to select the resource properties to be returned.'
-      parameters:
-        - name: managementDataType
-          in: query
-          description: This parameter identifies the type of management data that the file contains to select the resources from the collection resources identified with the path component of the URI.
-          required: true
-          $ref: '#/components/schemas/managementDataType-Type'
-        - name: beginTime
-          in: query
-          description: This parameter identifies the time stamp no later than which the file became available to select the resources from the collection resources identified with the path component of the URI.
-          required: true
-          $ref: '#/components/schemas/dateTime-Type'
-        - name: endTime
-          in: query
-          description: This parameter identifies the time stamp no earlier than which the file became available to select the resources from the collection resources identified with the path component of the URI.
-          required: true
-          $ref: '#/components/schemas/dateTime-Type'
-      responses:
-        '200':
-          description: 'Success case ("200 OK"). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.'
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/fileInfoRetrieval-ResponseType'
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/error-ResponseType'
-  /subscriptions:
-    post:
-      summary: Create a subscription
-      description: To create a subscription the representation of the subscription is POSTed on the /subscriptions collection resource.
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/subscription-RequestType'
-      responses:
-        '201':
-          description: Success case ("201 Created"). The representation of the newly created subscription resource shall be returned.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/subscription-ResponseType'
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/error-ResponseType'
-      callbacks:
-        notifyFileReady:
-          '{request.body#/consumerReference}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/notifyFileReady-NotifType'
-              responses:
-                '204':
-                  description: Success case ("204 No Content"). The notification is successfully delivered. The response message body is absent.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/error-ResponseType'
-        notifyFilePreparationError:
-          '{request.body#/consumerReference}':
-            post:
-              requestBody:
-                required: true
-                content:
-                  application/json:
-                    schema:
-                      $ref: '#/components/schemas/notifyFilePreparationError-NotifType'
-              responses:
-                '204':
-                  description: Success case ("204 No Content"). The notification is successfully delivered. The response message body is absent.
-                default:
-                  description: Error case.
-                  content:
-                    application/json:
-                      schema:
-                        $ref: '#/components/schemas/error-ResponseType'
-    delete:
-      summary: Delete all subscriptions made with a specific consumerReferenceId
-      description: The subscriptions are deleted by deleting the corresponding subscription resources. The resources to be deleted are identified with the path component of the URI pointing to the /subscription collection resource and filtering on the consumerReferenceId provided in the query part.
-      parameters:
-        - name: consumerReferenceId
-          in: query
-          description: Identifies the subscriptions to be deleted.
-          required: true
-          schema:
-            $ref: '#/components/schemas/consumerReferenceId-QueryType'
-      responses:
-        '204':
-          description: Success case ("204 No Content"). The subscription resources have been deleted. The response message body is absent.
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/error-ResponseType'
-  '/subscriptions/{subscriptionId}':
-    delete:
-      summary: Delete a single subscription
-      description: The subscription is deleted by deleting the corresponding subscription resource. The resource to be deleted is identified with the path component of the URI.
-      parameters:
-        - name: subscriptionId
-          in: path
-          description: Identifies the subscription to be deleted.
-          required: true
-          schema:
-            $ref: '#/components/schemas/subscriptionId-PathType'
-      responses:
-        '204':
-          description: Success case ("204 No Content"). The subscription resource has been deleted. The response message body is absent.
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/error-ResponseType'
-components:
-  schemas:
-    dateTime-Type:
-      type: string
-      format: date-Time
-    uri-Type:
-      type: string
-    long-Type:
-      type: string
-      format: long
-    additionalText-Type:
-      type: string
-    reason-Type:
-      type: string
-    fileInfoRetrieval-ResponseType:
-      type: object
-      properties:
-        data:
-          type: array
-          items:
-            $ref: '#/components/schemas/fileInfo-Type'
-    fileInfo-Type:
-      type: object
-      properties:
-        fileLocation:
-          $ref: '#/components/schemas/uri-Type'
-        fileSize:
-          $ref: '#/components/schemas/long-Type'
-        fileReadyTime:
-          $ref: '#/components/schemas/dateTime-Type'
-        fileExpirationTime:
-          $ref: '#/components/schemas/dateTime-Type'
-        fileCompression:
-          type: string
-        fileFormat:
-          type: string
-    error-ResponseType:
-      type: object
-      properties:
-        error:
-          type: object
-          properties:
-            errorInfo:
-              type: string
-    managementDataType-Type:
-      type: string
-      enum:
-        - PM
-    header-Type:
-      description: Header used in notifications as notification header
-      type: object
-      properties:
-        uri:
-          $ref: '#/components/schemas/uri-Type'
-        notificationId:
-          $ref: '#/components/schemas/notificationId-Type'
-        notificationType:
-          $ref: '#/components/schemas/notificationType-Type'
-        eventTime:
-          $ref: '#/components/schemas/dateTime-Type'
-    subscriptionId-PathType:
-      type: string
-    filter-Type:
-      type: string
-    notificationId-Type:
-      $ref: '#/components/schemas/long-Type'
-    notificationType-Type:
-      type: string
-      enum:
-        - notifyFileReady
-        - notifyFilePreparationError
-    subscription-ResourceType:
-      type: object
-      properties:
-        consumerReference:
-          $ref: '#/components/schemas/uri-Type'
-        timeTick:
-          $ref: '#/components/schemas/long-Type'
-        filter:
-          $ref: '#/components/schemas/filter-Type'
-    subscription-RequestType:
-      type: object
-      properties:
-        data:
-          $ref: '#/components/schemas/subscription-ResourceType'
-    subscription-ResponseType:
-      type: object
-      properties:
-        data:
-          $ref: '#/components/schemas/subscription-ResourceType'
-    consumerReferenceId-QueryType:
-      $ref: '#/components/schemas/uri-Type'
-    notifyFileReady-NotifType:
-      type: object
-      properties:
-        header:
-          $ref: '#/components/schemas/header-Type'
-        body:
-          type: object
-          properties:
-            fileInfoList:
-              type: array
-              items:
-                $ref: '#/components/schemas/fileInfo-Type'
-            additionalText:
-              $ref: '#/components/schemas/additionalText-Type'
-    notifyFilePreparationError-NotifType:
-      type: object
-      properties:
-        header:
-          $ref: '#/components/schemas/header-Type'
-        body:
-          type: object
-          properties:
-            fileInfoList:
-              type: array
-              items:
-                $ref: '#/components/schemas/fileInfo-Type'
-            reason:
-              $ref: '#/components/schemas/reason-Type'
-            additionalText:
-              $ref: '#/components/schemas/additionalText-Type'
+paths: {}
+
diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml
index 1892b8fb3ee95d82109a62a4c8689a1c706fab0b..6aae2f61c8ea7e906aaecb9f9392ec0dfbc39247 100644
--- a/OpenAPI/coslaNrm.yaml
+++ b/OpenAPI/coslaNrm.yaml
@@ -113,8 +113,8 @@ components:
 
     ManagedEntity-Single:
       oneOf:
-        - $ref: 'sliceNrm.yaml#/components/schemas/NetworkSlice'
-        - $ref: 'sliceNrm.yaml#/components/schemas/NetworkSliceSubnet'
+        - $ref: 'sliceNrm.yaml#/components/schemas/NetworkSlice-Single'
+        - $ref: 'sliceNrm.yaml#/components/schemas/NetworkSliceSubnet-Single'
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-Attr'
           
diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml
index e3b71407f4ee0e5483d6bbcec7a7b4c984f52348..9355f53e958d42219e74b5782f326871684f5b6a 100644
--- a/OpenAPI/genericNrm.yaml
+++ b/OpenAPI/genericNrm.yaml
@@ -1331,8 +1331,8 @@ components:
     ManagedFunction-ncO:
       type: object
       properties:
-        MeasurementControl:
-          $ref: '#/components/schemas/MeasurementControl-Multiple'
+        PerfMetricJob:
+          $ref: '#/components/schemas/PerfMetricJob-Multiple'
         ThresholdMonitor:
           $ref: '#/components/schemas/ThresholdMonitor-Multiple'
         ThresholdMonitoringCapability:
@@ -1552,7 +1552,7 @@ components:
     PerfMetricJob-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/MetricProdJob-Single'
+        $ref: '#/components/schemas/PerfMetricJob-Single'
     ThresholdMonitor-Multiple:
       type: array
       items:
diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml
index c4a4ba807293a0795d1202e23152a6fb179cc7e8..6fffb075d1254cb3282d3b1c3ae4613721355d2f 100644
--- a/OpenAPI/nrNrm.yaml
+++ b/OpenAPI/nrNrm.yaml
@@ -172,7 +172,7 @@ components:
         timeDuration:
           type: integer
 
-    UeAccProbilityDistPerSSB:
+    UeAccProbilityDist:
       type: object
       properties:
         targetProbability:
@@ -180,7 +180,7 @@ components:
         numberofpreamblessent:
           type: integer
 
-    UeAccDelayProbilityDistPerSSB:
+    UeAccDelayProbilityDist:
       type: object
       properties:
         targetProbability:
@@ -421,11 +421,11 @@ components:
         rimRSSubcarrierSpacing:
           type: integer
         rIMRSBandwidth:
-          type: integer
+         type: integer
         nrofGlobalRIMRSFrequencyCandidates:
           type: integer
         rimRSCommonCarrierReferencePoint:
-          type: integer
+         type: integer
         rimRSStartingFrequencyOffsetIdList:
           type: array
           items:
@@ -435,13 +435,13 @@ components:
       type: object
       properties:
         nrofRIMRSSequenceCandidatesofRS1:
-          type: integer
+         type: integer
         rimRSScrambleIdListofRS1:
           type: array
           items:
             type: integer
         nrofRIMRSSequenceCandidatesofRS2:
-          type: integer
+         type: integer
         rimRSScrambleIdListofRS2:
           type: array
           items:
@@ -462,33 +462,33 @@ components:
         dlULSwitchingPeriod1:
           type: string
           enum:
-            - MS0P5
-            - MS0P625
-            - MS1
-            - MS1P25
-            - MS2
-            - MS2P5
-            - MS3
-            - MS4
-            - MS5
-            - MS10
-            - MS20
+           - MS0P5
+           - MS0P625
+           - MS1
+           - MS1P25
+           - MS2
+           - MS2P5
+           - MS3
+           - MS4
+           - MS5
+           - MS10
+           - MS20
         symbolOffsetOfReferencePoint1:
-          type: integer
+           type: integer
         dlULSwitchingPeriod2:
           type: string
           enum:
-            - MS0P5
-            - MS0P625
-            - MS1
-            - MS1P25
-            - MS2
-            - MS2P5
-            - MS3
-            - MS4
-            - MS5
-            - MS10
-            - MS20
+           - MS0P5
+           - MS0P625
+           - MS1
+           - MS1P25
+           - MS2
+           - MS2P5
+           - MS3
+           - MS4
+           - MS5
+           - MS10
+           - MS20
         symbolOffsetOfReferencePoint2:
           type: integer
         totalnrofSetIdofRS1:
@@ -542,7 +542,7 @@ components:
             - ENABLE
             - DISABLE          
         reportInterval:
-          type: integer
+           type: integer
         nrofRIMRSReportInfo:
           type: integer
         maxPropagationDelay:
@@ -567,6 +567,7 @@ components:
       items:
         $ref: '#/components/schemas/TceMappingInfo'
 
+
 #-------- Definition of abstract IOCs --------------------------------------------
 
     RrmPolicy_-Attr:
@@ -623,12 +624,12 @@ components:
 
     ManagedElement-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
-              $ref: 'genericNRM.yaml#/components/schemas/ManagedElement-Attr'
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedElement-ncO'
+              $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-ncO'
         - type: object
           properties:
             GnbDuFunction:
@@ -656,12 +657,12 @@ components:
 
     GnbDuFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     gnbDuId:
@@ -674,7 +675,7 @@ components:
                       $ref: '#/components/schemas/GnbIdLength'
                     rimRSReportConf:
                       $ref: '#/components/schemas/RimRSReportConf'
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             RRMPolicyRatio:
@@ -689,14 +690,16 @@ components:
               $ref: '#/components/schemas/EP_F1C-Single'
             EP_F1U:
               $ref: '#/components/schemas/EP_F1U-Multiple'
+            DRACHOptimizationFunction:
+              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
     GnbCuUpFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     gnbId:
@@ -708,10 +711,10 @@ components:
                     plmnInfoList:
                       $ref: '#/components/schemas/PlmnInfoList'
                     configurable5QISetRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             RRMPolicyRatio:
@@ -730,12 +733,12 @@ components:
               $ref: '#/components/schemas/EP_S1U-Multiple'
     GnbCuCpFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     gnbId:
@@ -754,19 +757,17 @@ components:
                       $ref: '#/components/schemas/GGnbIdList'
                     xnWhiteList:
                       $ref: '#/components/schemas/GGnbIdList'
-                    xnHOBlackList:
-                      $ref: '#/components/schemas/GGnbIdList'
-                    x2HOBlackList:
+                    x2XnHOBlackList:
                       $ref: '#/components/schemas/GEnbIdList'
                     mappingSetIDBackhaulAddress:
                       $ref: '#/components/schemas/MappingSetIDBackhaulAddress'
                     tceMappingInfoList:
                       $ref: '#/components/schemas/TceMappingInfoList'
                     configurable5QISetRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             RRMPolicyRatio:
@@ -787,19 +788,17 @@ components:
               $ref: '#/components/schemas/DANRManagementFunction-Single'
             DESManagementFunction:
               $ref: '#/components/schemas/DESManagementFunction-Single'
-            DRACHOptimizationFunction:
-              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
             DMROFunction:
               $ref: '#/components/schemas/DMROFunction-Single'
 
     NrCellCu-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     cellLocalId:
@@ -807,8 +806,8 @@ components:
                     plmnInfoList:
                       $ref: '#/components/schemas/PlmnInfoList'
                     nRFrequencyRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             RRMPolicyRatio:
@@ -823,27 +822,27 @@ components:
               $ref: '#/components/schemas/EUtranFreqRelation-Multiple'
             DESManagementFunction:
               $ref: '#/components/schemas/DESManagementFunction-Single'
-            DRACHOptimizationFunction:
-              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
             DMROFunction:
               $ref: '#/components/schemas/DMROFunction-Single'
             CESManagementFunction:
               $ref: '#/components/schemas/CESManagementFunction-Single'
+            DPCIConfigurationFunction:
+              $ref: '#/components/schemas/DPCIConfigurationFunction-Single'
 
     NrCellDu-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     administrativeState:
-                      $ref: 'genericNRM.yaml#/components/schemas/AdministrativeState'
+                      $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState'
                     operationalState:
-                      $ref: 'genericNRM.yaml#/components/schemas/OperationalState'
+                      $ref: 'genericNrm.yaml#/components/schemas/OperationalState'
                     cellLocalId:
                       type: integer
                     cellState:
@@ -883,30 +882,30 @@ components:
                     nrSectorCarrierRef:
                       type: array
                       items:
-                        $ref: 'genericNRM.yaml#/components/schemas/Dn'
+                        $ref: 'genericNrm.yaml#/components/schemas/Dn'
                     bwpRef:
                       type: array
                       items:
-                        $ref: 'genericNRM.yaml#/components/schemas/Dn'
+                        $ref: 'genericNrm.yaml#/components/schemas/Dn'
                     nRFrequencyRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
                     victimSetRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
                     aggressorSetRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             RRMPolicyRatio:
               $ref: '#/components/schemas/RRMPolicyRatio-Multiple'
-            DPCIConfigurationFunction:
-              $ref: '#/components/schemas/DPCIConfigurationFunction-Single'
             CPCIConfigurationFunction:
               $ref: '#/components/schemas/CPCIConfigurationFunction-Single'
+            DRACHOptimizationFunction:
+              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
 
     NRFrequency-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -924,7 +923,7 @@ components:
                     maximum: 256
     EUtranFrequency-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -941,12 +940,12 @@ components:
 
     NrSectorCarrier-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     txDirection:
@@ -962,20 +961,20 @@ components:
                     bSChannelBwUL:
                       type: integer
                     sectorEquipmentFunctionRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             CommonBeamformingFunction:
               $ref: '#/components/schemas/CommonBeamformingFunction-Single'
     Bwp-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     bwpContext:
@@ -990,10 +989,10 @@ components:
                       type: integer
                     numberOfRBs:
                       type: integer
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
     CommonBeamformingFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1012,7 +1011,7 @@ components:
               $ref: '#/components/schemas/Beam-Multiple'
     Beam-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1043,7 +1042,7 @@ components:
                       maximum: 1800
     RRMPolicyRatio-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1060,7 +1059,7 @@ components:
 
     NRCellRelation-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1071,9 +1070,9 @@ components:
                     cellIndividualOffset:
                       $ref: '#/components/schemas/CellIndividualOffset'
                     adjacentNRCellRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
                     nRFrequencyRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
                     isRemoveAllowed:
                       type: boolean
                     isHOAllowed:
@@ -1086,20 +1085,20 @@ components:
                       type: boolean
     EUtranCellRelation-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     adjacentEUtranCellRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
     NRFreqRelation-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1159,10 +1158,10 @@ components:
                     tReselectionNRSfMedium:
                       $ref: '#/components/schemas/TReselectionNRSf'
                     nRFrequencyRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
     EUtranFreqRelation-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1222,10 +1221,10 @@ components:
                     tReselectionNRSfMedium:
                       $ref: '#/components/schemas/TReselectionNRSf'
                     eUTranFrequencyRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
     DANRManagementFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1238,7 +1237,7 @@ components:
 
     DESManagementFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1263,17 +1262,17 @@ components:
                     isProbingCapable:
                       type: string
                       enum:
-                        - yes
-                        - no
+                         - yes
+                         - no
                     energySavingState:
                       type: string
                       enum:
-                        - isNotEnergySaving
-                        - isEnergySaving
+                         - isNotEnergySaving
+                         - isEnergySaving
 
     DRACHOptimizationFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1281,15 +1280,15 @@ components:
                   properties:
                     drachOptimizationControl:
                       type: boolean
-                    ueAccProbilityDistPerSSB:
-                      $ref: "#/components/schemas/UeAccProbilityDistPerSSB"
-                    ueAccDelayProbilityDistPerSSB:
-                      $ref: "#/components/schemas/UeAccDelayProbilityDistPerSSB"
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+                    ueAccProbilityDist:
+                      $ref: "#/components/schemas/UeAccProbilityDist"
+                    ueAccDelayProbilityDist:
+                      $ref: "#/components/schemas/UeAccDelayProbilityDist"
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
 
     DMROFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes: 
@@ -1306,7 +1305,7 @@ components:
 
     DPCIConfigurationFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1319,7 +1318,7 @@ components:
 
     CPCIConfigurationFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1332,7 +1331,7 @@ components:
 
     CESManagementFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1343,17 +1342,17 @@ components:
                     energySavingControl:
                       type: string
                       enum:
-                        - toBeEnergySaving
-                        - toBeNotEnergySaving
+                         - toBeEnergySaving
+                         - toBeNotEnergySaving
                     energySavingState:
                       type: string
                       enum:
-                        - isNotEnergySaving
-                        - isEnergySaving
+                         - isNotEnergySaving
+                         - isEnergySaving
 
     RimRSGlobal-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1370,7 +1369,7 @@ components:
 
     RimRSSet-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1395,23 +1394,23 @@ components:
                 rimRSMonitoringOccasionStartingOffset:
                   type: integer
                 nRCellDURefs:
-                  $ref: 'genericNRM.yaml#/components/schemas/DnList'
+                  $ref: 'genericNrm.yaml#/components/schemas/DnList'
 
     ExternalGnbDuFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     gnbId:
                       $ref: '#/components/schemas/GnbId'
                     gnbIdLength:
                       $ref: '#/components/schemas/GnbIdLength'
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             EP_F1C:
@@ -1420,19 +1419,19 @@ components:
               $ref: '#/components/schemas/EP_F1U-Multiple'
     ExternalGnbCuUpFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     gnbId:
                       $ref: '#/components/schemas/GnbId'
                     gnbIdLength:
                       $ref: '#/components/schemas/GnbIdLength'
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             EP_E1:
@@ -1443,13 +1442,13 @@ components:
               $ref: '#/components/schemas/EP_XnU-Multiple'
     ExternalGnbCuCpFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
                 - $ref: >-
-                    genericNRM.yaml#/components/schemas/ManagedFunction-Attr
+                    genericNrm.yaml#/components/schemas/ManagedFunction-Attr
                 - type: object
                   properties:
                     gnbId:
@@ -1458,7 +1457,7 @@ components:
                       $ref: '#/components/schemas/GnbIdLength'
                     plmnId:
                       $ref: '#/components/schemas/PlmnId'
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             ExternalNrCellCu:
@@ -1471,12 +1470,12 @@ components:
               $ref: '#/components/schemas/EP_F1C-Multiple'
     ExternalNrCellCu-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     cellLocalId:
@@ -1486,47 +1485,47 @@ components:
                     plmnIdList:
                       $ref: '#/components/schemas/PlmnIdList'
                     nRFrequencyRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
     ExternalENBFunction-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     eNBId:
                       type: integer
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             ExternalEUTranCell:
               $ref: '#/components/schemas/ExternalEUTranCell-Multiple'
     ExternalEUTranCell-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     EUtranFrequencyRef:
-                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
-        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
 
     EP_XnC-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1535,12 +1534,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_E1-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1549,12 +1548,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_F1C-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1563,12 +1562,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_NgC-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1577,12 +1576,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_X2C-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1591,12 +1590,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_XnU-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1605,12 +1604,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_F1U-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1619,12 +1618,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_NgU-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1633,14 +1632,15 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
                     epTransportRefs:
                       $ref: 'genericNrm.yaml#/components/schemas/DnList'
+
     EP_X2U-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1649,12 +1649,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_S1U-Single:
       allOf:
-        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1846,7 +1846,7 @@ components:
         - $ref: '#/components/schemas/DPCIConfigurationFunction-Single'
         - $ref: '#/components/schemas/CPCIConfigurationFunction-Single'
         - $ref: '#/components/schemas/CESManagementFunction-Single'
-
+     
         - $ref: '#/components/schemas/RimRSGlobal-Single'
         - $ref: '#/components/schemas/RimRSSet-Single'
         
diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml
index 18a2eef92f6efb62f34301afda75917973e856ee..1a2d7467759185913530e46c440af8618892a202 100644
--- a/OpenAPI/sliceNrm.yaml
+++ b/OpenAPI/sliceNrm.yaml
@@ -1,13 +1,13 @@
 openapi: 3.0.1
 info:
   title: Slice NRM
-  version: 16.5.0
+  version: 17.2.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 V16.4.0; 5G NRM, Slice NRM
+  description: 3GPP TS 28.541 V17.2.0; 5G NRM, Slice NRM
   url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/
 paths: {}
 components:
@@ -25,11 +25,41 @@ components:
         - NOMADIC
         - RESTRICTED MOBILITY
         - FULLY MOBILITY
+    SynAvailability:
+      type: string
+      enum:
+        - NOT SUPPORTED
+        - BETWEEN BS AND UE
+        - BETWEEN BS AND UE & UE AND UE
+    PositioningAvailability:
+      type: array
+      items:
+        type: string
+        enum:
+          - CIDE-CID
+          - OTDOA
+          - RF FINGERPRINTING
+          - AECID
+          - HYBRID POSITIONING
+          - NET-RTK
+    Predictionfrequency:
+      type: string
+      enum:
+        - PERSEC
+        - PERMIN
+        - PERHOUR
     SharingLevel:
       type: string
       enum:
         - SHARED
         - NON-SHARED
+
+    NetworkSliceSharingIndicator:
+      type: string
+      enum:
+        - SHARED
+        - NON-SHARED
+
     ServiceType:
       type: string
       enum:
@@ -37,6 +67,15 @@ components:
         - RLLC
         - MIoT
         - V2X
+    SliceSimultaneousUse:
+      type: string
+      enum:
+        - ZERO
+        - ONE
+        - TWO
+        - THREE
+        - FOUR
+
     PerfReqEmbb:
       type: object
       properties:
@@ -85,11 +124,13 @@ components:
         - CHARACTER
         - SCALABILITY
     Tagging:
-      type: string
-      enum:
-        - PERFORMANCE
-        - FUNCTION
-        - OPERATION
+      type: array
+      items:
+        type: string
+        enum:
+          - PERFORMANCE
+          - FUNCTION
+          - OPERATION
     Exposure:
       type: string
       enum:
@@ -189,7 +230,7 @@ components:
           $ref: '#/components/schemas/Float'
         maxThpt:
           $ref: '#/components/schemas/Float'
-    	 MaxPktSize:
+    MaxPktSize:
       type: object
       properties:
         servAttrCom:
@@ -217,6 +258,26 @@ components:
           $ref: '#/components/schemas/ServAttrCom'
         support:
           $ref: '#/components/schemas/Support'
+    Synchronicity:
+      type: object
+      properties:
+        servAttrCom:
+          $ref: '#/components/schemas/ServAttrCom'
+        availability:
+          $ref: '#/components/schemas/SynAvailability'
+        accuracy:
+          $ref: '#/components/schemas/Float'
+    Positioning:
+      type: object
+      properties:
+        servAttrCom:
+          $ref: '#/components/schemas/ServAttrCom'
+        availability:
+          $ref: '#/components/schemas/PositioningAvailability'
+        predictionfrequency:
+          $ref: '#/components/schemas/Predictionfrequency'
+        accuracy:
+          $ref: '#/components/schemas/Float'
     UserMgmtOpen:
       type: object
       properties:
@@ -252,7 +313,7 @@ components:
           type: integer
         latency:
           type: integer
-        dLThptPerSlice:
+        dLThptPerSliceSubnet:
           $ref: '#/components/schemas/DLThptPerSliceSubnet'
         dLThptPerUEPerSubnet:
           $ref: '#/components/schemas/DLThptPerUEPerSubnet'
@@ -262,11 +323,15 @@ components:
           $ref: '#/components/schemas/ULThptPerUEPerSubnet'
         maxNumberOfPDUSessions:
           type: integer
+        maxPktSize:
+          type: integer
+        delayTolerance:
+          $ref: '#/components/schemas/DelayTolerance'
+        sliceSimultaneousUse:
+          $ref: '#/components/schemas/SliceSimultaneousUse'
     RANSliceSubnetProfile:
       type: object
       properties:
-        coverageAreaGeoPolygon:
-          type: string
         coverageAreaTAList:
           type: integer
         MobilityLevel:
@@ -277,9 +342,9 @@ components:
           type: integer
         activityFactor:
           type: integer
-        dLThptPerUE:
+        dLThptPerUEPerSubnet:
           $ref: '#/components/schemas/ULThptPerUEPerSubnet'
-        uLThptPerUE:
+        uLThptPerUEPerSubnet:
           $ref: '#/components/schemas/ULThptPerUEPerSubnet'
         uESpeed:
           type: integer
@@ -287,6 +352,12 @@ components:
           type: string
         serviceType:
           $ref: '#/components/schemas/ServiceType'
+        maxPktSize:
+          type: integer
+        delayTolerance:
+          $ref: '#/components/schemas/DelayTolerance'
+        sliceSimultaneousUse:
+          $ref: '#/components/schemas/SliceSimultaneousUse'
     TopSliceSubnetProfile:
       type: object
       properties:
@@ -296,27 +367,27 @@ components:
           type: integer
         maxNumberofUEs:
           type: integer
-        dLThptPerSlice:
+        dLThptPerSliceSubnet:
           $ref: '#/components/schemas/DLThptPerSliceSubnet'
-        dLThptPerUE:
+        dLThptPerUEPerSubnet:
           $ref: '#/components/schemas/DLThptPerUEPerSubnet'
-        uLThptPerSlice:
+        uLThptPerSliceSubnet:
           $ref: '#/components/schemas/ULThptPerSliceSubnet'
-        uLThptPerUE:
+        uLThptPerUEPerSubnet:
           $ref: '#/components/schemas/ULThptPerUEPerSubnet'
         maxPktSize:
           type: integer
-        maxNumberOfPDUSessions:
-          type: integer
-    ServiceProfileList:
+        delayTolerance:
+          $ref: '#/components/schemas/DelayTolerance'
+        sliceSimultaneousUse:
+          $ref: '#/components/schemas/SliceSimultaneousUse'
+    ServiceProfile:
       type: object
-      additionalProperties:
-        type: object
-        properties:
-          snssaiList:
-            $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
-          plmnIdList:
-            $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList'
+      properties:
+          serviceProfileId: 
+            type: string
+          plmnInfoList:
+            $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList'
           maxNumberofUEs:
             type: number
           latency:
@@ -325,8 +396,8 @@ components:
             $ref: '#/components/schemas/MobilityLevel'
           sst:
             $ref: 'nrNrm.yaml#/components/schemas/Sst'
-          resourceSharingLevel:
-            $ref: '#/components/schemas/SharingLevel'
+          networkSliceSharingIndicator:
+            $ref: '#/components/schemas/NetworkSliceSharingIndicator'
           availability:
             type: number
           delayTolerance:
@@ -349,6 +420,10 @@ components:
             $ref: '#/components/schemas/KPIMonitoring'
           nBIoT:
             $ref: '#/components/schemas/NBIoT'
+          synchronicity:
+            $ref: '#/components/schemas/Synchronicity'
+          positioning:
+            $ref: '#/components/schemas/Positioning'
           userMgmtOpen:
             $ref: '#/components/schemas/UserMgmtOpen'
           v2XModels:
@@ -371,42 +446,62 @@ components:
             type: string
           maxULDataVolume:
             type: string
-    SliceProfileList:
+          sliceSimultaneousUse:
+            $ref: '#/components/schemas/SliceSimultaneousUse'
+
+    SliceProfile:
       type: object
-      additionalProperties:
-        type: object
-        properties:
-          snssaiList:
-            $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
-          plmnIdList:
-            $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList'
+      properties:
+          serviceProfileId: 
+            type: string
+          plmnInfoList:
+            $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList'
           perfReq:
             $ref: '#/components/schemas/PerfReq'
-          CNSliceSubnetProfile:
+          cNSliceSubnetProfile:
             $ref: '#/components/schemas/CNSliceSubnetProfile'
-          RANSliceSubnetProfile:
+          rANSliceSubnetProfile:
             $ref: '#/components/schemas/RANSliceSubnetProfile'
-          TopSliceSubnetProfile:
+          topSliceSubnetProfile:
             $ref: '#/components/schemas/TopSliceSubnetProfile'
-          maxNumberofUEs:
-            type: number
-          coverageAreaTAList:
-            $ref: '5gcNrm.yaml#/components/schemas/TACList'
-          latency:
-            type: number
-          uEMobilityLevel:
-            $ref: '#/components/schemas/MobilityLevel'
-          resourceSharingLevel:
-            $ref: '#/components/schemas/SharingLevel'
 
     IpAddress:
       oneOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr'
         - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr'
 
+    ServiceProfileList:
+       type: array
+       items:
+        $ref: '#/components/schemas/ServiceProfile'
+            
+    SliceProfileList:
+      type: array
+      items:
+        $ref: '#/components/schemas/SliceProfile'
+
 #------------ Definition of concrete IOCs ----------------------------------------
+    SubNetwork-Single:
+      allOf:
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - type: object
+          properties:
+            attributes:
+              allOf:
+                - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO'
+        - type: object
+          properties:
+            SubNetwork:
+              $ref: '#/components/schemas/SubNetwork-Multiple'
+            NetworkSlice:
+              $ref: '#/components/schemas/NetworkSlice-Multiple'
+            NetworkSliceSubnet:
+              $ref: '#/components/schemas/NetworkSliceSubnet-Multiple'
+            EP_Transport:
+              $ref: '#/components/schemas/EP_Transport-Multiple'
 
-    NetworkSlice:
+    NetworkSlice-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
@@ -425,7 +520,7 @@ components:
                     serviceProfileList:
                       $ref: '#/components/schemas/ServiceProfileList'
 
-    NetworkSliceSubnet:
+    NetworkSliceSubnet-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
@@ -447,9 +542,9 @@ components:
                       $ref: '#/components/schemas/NsInfo'
                     sliceProfileList:
                       $ref: '#/components/schemas/SliceProfileList'
-            EPTransport:
-             $ref: '#/components/schemas/EP_Transport-Multiple'
-                      
+                    epTransportRefList:
+                      $ref: 'genericNrm.yaml#/components/schemas/DnList'
+
     EP_Transport-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -468,6 +563,22 @@ components:
                   type: string 
                 epApplicationRefs:
                   $ref: 'genericNrm.yaml#/components/schemas/DnList'
+
+#-------- Definition of JSON arrays for name-contained IOCs ----------------------
+    SubNetwork-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/SubNetwork-Single'
+
+    NetworkSlice-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/NetworkSlice-Single'
+
+    NetworkSliceSubnet-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/NetworkSliceSubnet-Single'
                       
     EP_Transport-Multiple:
       type: array
@@ -478,6 +589,7 @@ components:
 
     resources-sliceNrm:
       oneOf:
-       - $ref: '#/components/schemas/NetworkSlice'
-       - $ref: '#/components/schemas/NetworkSliceSubnet'
+       - $ref: '#/components/schemas/SubNetwork-Single'
+       - $ref: '#/components/schemas/NetworkSlice-Single'
+       - $ref: '#/components/schemas/NetworkSliceSubnet-Single'
        - $ref: '#/components/schemas/EP_Transport-Single'