diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml
index 5fab0788643ec9173fb5fd524c1e43eac6a44ea8..ef05134728084311de95d103547cb83dc771be7b 100644
--- a/OpenAPI/TS28318_DsoNrm.yaml
+++ b/OpenAPI/TS28318_DsoNrm.yaml
@@ -25,15 +25,6 @@ components:
 
 
 #-------- Definition of concrete IOCs --------------------------------------------
-    MnS:
-      oneOf:
-        - type: object
-          properties:
-            SubNetwork:
-              type: array
-              items: 
-                $ref: '#/components/schemas/SubNetwork-ncO-DsoNrm'
-
     SubNetwork-ncO-DsoNrm:
       type: object
       properties:
@@ -92,6 +83,5 @@ components:
 
     resources-DSORecovery:
       oneOf:
-        - $ref: '#/components/schemas/MnS'
         - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single'
         - $ref: '#/components/schemas/DsoThresholdMonitor-Single'        
diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml
index 99a1b50c04efd36feed3589dfc54e356d4a3f2fb..98f54753597c16d8b3fe3a82e51224202ff0bf2f 100755
--- a/OpenAPI/TS28536_CoslaNrm.yaml
+++ b/OpenAPI/TS28536_CoslaNrm.yaml
@@ -140,21 +140,6 @@ components:
           $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple'
 
 #-------- Definition of concrete IOCs --------------------------------------------
-    MnS:
-      oneOf:
-        - type: object
-          properties:
-            SubNetwork:
-              type: array
-              items:
-                $ref: '#/components/schemas/SubNetwork-ncO-CoslaNrm'
-        - type: object
-          properties:
-            ManagedElement:
-              type: array
-              items:
-                $ref: '#/components/schemas/ManagedElement-ncO-CoslaNrm'
-
     AssuranceClosedControlLoop-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -226,7 +211,6 @@ components:
 
     resources-coslaNrm:
       oneOf:
-       - $ref: '#/components/schemas/MnS'
        - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single'
        - $ref: '#/components/schemas/AssuranceGoal-Single'    
        - $ref: '#/components/schemas/AssuranceReport-Single'
diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml
index 6745e3fa8c318b40217be45f9239b5f3714966c3..43f7cbefb9cb9ab9093054e0fd7e59a189bbba0f 100644
--- a/OpenAPI/TS28538_EdgeNrm.yaml
+++ b/OpenAPI/TS28538_EdgeNrm.yaml
@@ -158,14 +158,6 @@ components:
           $ref: '#/components/schemas/EdgeDataNetwork-Multiple'
 
 #-------- Definition of concrete IOCs --------------------------------------------
-    MnS:
-      oneOf:
-        - type: object
-          properties:
-            SubNetwork:
-              type: array
-              items:
-                $ref: '#/components/schemas/SubNetwork-ncO-EdgeNrm'
 
     EdgeDataNetwork-Single:
       allOf:
@@ -415,7 +407,6 @@ components:
 
     resources-edgeNrm:
       oneOf:
-        - $ref: '#/components/schemas/MnS'
         - $ref: '#/components/schemas/EASFunction-Single'
         - $ref: '#/components/schemas/ECSFunction-Single'
         - $ref: '#/components/schemas/EESFunction-Single'
diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 825a03d6283c8d67c326042bab7b0dd3513822f5..689a50c84914cff96803554a7691146ff7168b01 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -3021,21 +3021,6 @@ components:
           $ref: '#/components/schemas/MnpfFunction-Multiple'
 
 #-------- Definition of concrete IOCs --------------------------------------------
-    MnS:
-      oneOf:
-        - type: object
-          properties:
-            SubNetwork:
-              type: array
-              items:
-                $ref: '#/components/schemas/SubNetwork-ncO-5GcNrm'
-        - type: object
-          properties:
-            ManagedElement:
-              type: array
-              items:
-                $ref: '#/components/schemas/ManagedElement-ncO-5GcNrm'
-
     AmfFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -5767,7 +5752,6 @@ components:
 
     resources-5gcNrm:
       oneOf:
-       - $ref: '#/components/schemas/MnS'
        - $ref: '#/components/schemas/AmfFunction-Single'
        - $ref: '#/components/schemas/SmfFunction-Single'
        - $ref: '#/components/schemas/UpfFunction-Single'
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index d7a5617a92c4f18eaa48ec9ae109cf556b93be4a..2e447e03eeee2d1ae36a9c802368e1c8236eba29 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -784,21 +784,6 @@ components:
 
 #-------- Definition of concrete IOCs --------------------------------------------
 
-    MnS:
-      oneOf:
-        - type: object
-          properties:
-            SubNetwork:
-              type: array
-              items:
-                $ref: '#/components/schemas/SubNetwork-ncO-NrNrm'
-        - type: object
-          properties:
-            ManagedElement:
-              type: array
-              items:
-                $ref: '#/components/schemas/ManagedElement-ncO-NrNrm'
-
     GnbDuFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2189,8 +2174,6 @@ components:
 
     resources-nrNrm:
       oneOf:
-        - $ref: '#/components/schemas/MnS'
-
         - $ref: '#/components/schemas/GnbDuFunction-Single'
         - $ref: '#/components/schemas/GnbCuUpFunction-Single'
         - $ref: '#/components/schemas/GnbCuCpFunction-Single'
diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml
index d64929f39929cf1c5324b42886e5c1f63e7b03f6..c1a64bfd8fa323efebd19ab499c8ba629e25fd76 100755
--- a/OpenAPI/TS28541_SliceNrm.yaml
+++ b/OpenAPI/TS28541_SliceNrm.yaml
@@ -826,19 +826,6 @@ components:
 
 #------------ Definition of concrete IOCs ----------------------------------------
 
-    MnS:
-      oneOf:
-        - type: object
-          properties:
-            SubNetwork:
-              type: array
-              items:
-                $ref: '#/components/schemas/SubNetwork-ncO-SliceNrm'
-#        - type: object
-#          properties:
-#            ManagedElement:
-#              $ref: '#/components/schemas/ManagedElement-Multiple'
-
     NetworkSlice-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1082,9 +1069,7 @@ components:
 #------------ Definitions in TS 28.541 for TS 28.532 -----------------------------
 
     resources-sliceNrm:
-      oneOf:
-       - $ref: '#/components/schemas/MnS'
-               
+      oneOf:             
        - $ref: '#/components/schemas/NetworkSlice-Single'
        - $ref: '#/components/schemas/NetworkSliceSubnet-Single'
        - $ref: '#/components/schemas/EP_Transport-Single'
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 843a9cbcf3fdc0856d00619c564418c3e45e4c60..16385e044188b3b64aa9d539a629a3fdcad0e166 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -437,6 +437,10 @@ components:
     SubNetwork-ncO:
       type: object
       properties:
+        SubNetwork:
+          $ref: '#/components/schemas/SubNetwork-Multiple'
+        ManagedElement:
+          $ref: '#/components/schemas/ManagedElement-Multiple'
         ManagementNode:
           $ref: '#/components/schemas/ManagementNode-Multiple'
         MnsAgent:
@@ -688,8 +692,6 @@ components:
         - $ref: '#/components/schemas/Top' 
         - $ref: '#/components/schemas/SubNetwork-Attr'
         - $ref: '#/components/schemas/SubNetwork-ncO'
-        - $ref: '#/components/schemas/SubNetwork-Multiple'
-        - $ref: '#/components/schemas/ManagedElement-Multiple'
         - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm'
         - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm'
         - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm'
@@ -712,6 +714,17 @@ components:
         - $ref: 'TS28541_NrNrm.yaml#/components/schemas/ManagedElement-ncO-NrNrm'
         - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/ManagedElement-ncO-5GcNrm'
 
+    NrmRoot:
+      oneOf:
+        - type: object
+          properties:
+            SubNetwork:
+              $ref: '#/components/schemas/SubNetwork-Multiple'
+        - type: object
+          properties:
+            ManagedElement:
+              $ref: '#/components/schemas/ManagedElement-Multiple'
+
 #-------- Definition of YAML arrays for name-contained IOCs ----------------------
 
     VsDataContainer-Multiple:
@@ -756,7 +769,7 @@ components:
 
     resources-genericNrm:
       oneOf:
-
+       - $ref: '#/components/schemas/NrmRoot'
        - $ref: '#/components/schemas/VsDataContainer-Single'
        - $ref: '#/components/schemas/ManagementNode-Single'
        - $ref: '#/components/schemas/MnsAgent-Single'