diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml
index 758a190c8cb220a24bb0409fab189743adbe4778..2ab656cc6a606a41885fbe7006a2ddce1fcfe964 100644
--- a/OpenAPI/TS28104_MdaNrm.yaml
+++ b/OpenAPI/TS28104_MdaNrm.yaml
@@ -106,45 +106,25 @@ components:
               format: float
               minimum: 0
 
+#-------- Definition of types for name-containments ------
+    SubNetwork-ncO-MdaNrm:
+      type: object
+      properties:
+        MDAFunction:
+          $ref: '#/components/schemas/MDAFunction-Multiple'
+        MDAReport:
+          $ref: '#/components/schemas/MDAReport-Multiple'
+
+    ManagedElement-ncO-MdaNrm:
+      type: object
+      properties:
+        MDAFunction:
+          $ref: '#/components/schemas/MDAFunction-Multiple'
 #-------- Definition of abstract IOCs --------------------------------------------
 
 
 
 #-------- Definition of concrete IOCs --------------------------------------------
-
-    SubNetwork-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'
-        - type: object
-          properties:
-            SubNetwork:
-              $ref: '#/components/schemas/SubNetwork-Multiple'
-            ManagedElement:
-              $ref: '#/components/schemas/ManagedElement-Multiple'
-            MDAFunction:
-              $ref: '#/components/schemas/MDAFunction-Multiple'
-            MDAReport:
-              $ref: '#/components/schemas/MDAReport-Multiple'
-
-
-    ManagedElement-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr'
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO'
-        - type: object
-          properties:
-            MDAFunction:
-              $ref: '#/components/schemas/MDAFunction-Multiple'
-
     MDAFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -190,15 +170,6 @@ components:
 
 
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
-
-    SubNetwork-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/SubNetwork-Single'
-    ManagedElement-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/ManagedElement-Single'
     MDAFunction-Multiple:
       type: array
       items:
@@ -217,9 +188,6 @@ components:
 
     resources-mdaNrm:
       oneOf:
-        - $ref: '#/components/schemas/SubNetwork-Single'
-        - $ref: '#/components/schemas/ManagedElement-Single'
-
         - $ref: '#/components/schemas/MDAFunction-Single'
         - $ref: '#/components/schemas/MDARequest-Single'
         - $ref: '#/components/schemas/MDAReport-Single'
diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index 71e2d38533fd99bf45dafb46573d57df970de8d9..041506529984ab80ea9d9cbc263a20e7096b8b2c 100644
--- a/OpenAPI/TS28105_AiMlNrm.yaml
+++ b/OpenAPI/TS28105_AiMlNrm.yaml
@@ -79,45 +79,28 @@ components:
         resultStateInfo:
           type: string
 
-#-------- Definition of abstract IOCs --------------------------------------------
+#-------- Definition of types for name-containments ------
+    SubNetwork-ncO-AiMlNrm:
+      type: object
+      properties:
+        MLTrainingFunction:
+          $ref: '#/components/schemas/MLTrainingFunction-Multiple'
+        MLEntityRepository:
+          $ref: '#/components/schemas/MLEntityRepository-Multiple'
 
+    ManagedElement-ncO-AiMlNrm:
+      type: object
+      properties:
+        MLTrainingFunction:
+          $ref: '#/components/schemas/MLTrainingFunction-Multiple'
+        MLEntityRepository:
+          $ref: '#/components/schemas/MLEntityRepository-Multiple' 
 
+#-------- Definition of abstract IOCs --------------------------------------------
 
-#-------- Definition of concrete IOCs --------------------------------------------
 
-    SubNetwork-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'
-        - type: object
-          properties:
-            SubNetwork:
-              $ref: '#/components/schemas/SubNetwork-Multiple'
-            ManagedElement:
-              $ref: '#/components/schemas/ManagedElement-Multiple'
-            MLTrainingFunction:
-              $ref: '#/components/schemas/MLTrainingFunction-Multiple'
-            MLEntityRepository:
-              $ref: '#/components/schemas/MLEntityRepository-Multiple'
 
-    ManagedElement-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr'
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO'
-        - type: object
-          properties:
-            MLTrainingFunction:
-              $ref: '#/components/schemas/MLTrainingFunction-Multiple'
-            MLEntityRepository:
-              $ref: '#/components/schemas/MLEntityRepository-Multiple'
+#-------- Definition of concrete IOCs --------------------------------------------
 
     MLTrainingFunction-Single:
       allOf:
@@ -277,14 +260,6 @@ components:
 
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
 
-    SubNetwork-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/SubNetwork-Single'
-    ManagedElement-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/ManagedElement-Single'
     MLTrainingFunction-Multiple:
       type: array
       items:
@@ -314,9 +289,6 @@ components:
 
     resources-AiMlNrm:
       oneOf:
-        - $ref: '#/components/schemas/SubNetwork-Single'
-        - $ref: '#/components/schemas/ManagedElement-Single'
-
         - $ref: '#/components/schemas/MLTrainingFunction-Single'
         - $ref: '#/components/schemas/MLTrainingRequest-Single'
         - $ref: '#/components/schemas/MLTrainingProcess-Single'
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index 915541a592544d4b9ea15c4353c10e9dabb7b6f3..de7291d9fdf7003f0b185c48713900c448a2b91b 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -12,24 +12,16 @@ externalDocs:
 paths: {}
 components:
   schemas:
+
+  #-------- Definition of types for name-containments ------
+    SubNetwork-ncO-IntentNrm:
+      type: object
+      properties:
+        IntentHandlingFunction:
+          $ref: '#/components/schemas/IntentHandlingFunction-Multiple'
        
    #-------Definition of generic IOCs ----------#  
 
-    SubNetwork-Single:  
-      allOf:
-      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-      - type: object
-        properties:
-          attributes:
-            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
-      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'
-      - type: object
-        properties:
-          SubNetwork:
-            $ref: '#/components/schemas/SubNetwork-Multiple'
-          IntentHandlingFunction:
-            $ref: '#/components/schemas/IntentHandlingFunction-Multiple'
-
     Intent-Single:
       description: >-
         This IOC represents the properties of an Intent driven management information between MnS consumer and MnS producer.  
@@ -441,11 +433,6 @@ components:
 
    #------Definition of JSON arrays for name-contained IOCs ---------------#
 
-    SubNetwork-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/SubNetwork-Single'
-                                
     Intent-Multiple:
       type: array
       items:
@@ -467,7 +454,6 @@ components:
    #----- Definitions in TS 28.312 for TS 28.532 --------------------------#
     resources-intentNrm:
       oneOf:
-       - $ref: '#/components/schemas/SubNetwork-Single'
        - $ref: '#/components/schemas/IntentHandlingFunction-Single'       
        - $ref: '#/components/schemas/Intent-Single'
        - $ref: '#/components/schemas/IntentReport-Single'       
diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml
index ed6566f2312f1c62cdc68a8ae02cf36f0d8f4cee..afaffc6cb967c0b30b92dbf052d5b3c4b0aad754 100644
--- a/OpenAPI/TS28317_RanScNrm.yaml
+++ b/OpenAPI/TS28317_RanScNrm.yaml
@@ -13,24 +13,17 @@ paths: {}
 components:
   schemas:
        
+#-------- Definition of types for name-containments ------
+    SubNetwork-ncO-RanScNrm:
+      type: object
+      properties:
+        ScMgmtProfile:
+          $ref: '#/components/schemas/ScMgmtProfile-Multiple'
+        Sc_Process:
+          $ref: '#/components/schemas/Sc_Process-Multiple'
+
 #-------Definition of IOCs ----------# 
-    SubNetwork-Single:
-      allOf:
-      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-      - type: object
-        properties:
-          attributes:
-            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
-      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'
-      - type: object
-        properties:
-          SubNetwork:
-            $ref: '#/components/schemas/SubNetwork-Multiple'
-          ScMgmtProfile:
-            $ref: '#/components/schemas/ScMgmtProfile-Multiple'
-          Sc_Process:
-            $ref: '#/components/schemas/Sc_Process-Multiple'            
-    
+
     ScMgmtProfile-Single:
       description: >-
         The ScMgmtProfile represents MnS Consumer's requirements for self-configuration management 
@@ -150,10 +143,6 @@ components:
 #-------Definition of Data types ----------#  
 
 #------Definition of JSON arrays for name-contained IOCs ---------------#
-    SubNetwork-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/SubNetwork-Single'
     ScMgmtProfile-Multiple:
       type: array
       items:
@@ -168,7 +157,6 @@ components:
 #----- Definitions in TS 28.317 for TS 28.532 --------------------------#
     resources-RanScNrm:
       oneOf:
-       - $ref: '#/components/schemas/SubNetwork-Single'
        - $ref: '#/components/schemas/ScMgmtProfile-Single'
        - $ref: '#/components/schemas/Sc_Process-Single'       
 
diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml
index 3ae269c54bb08b5d48092f98b2de857407da6868..c94eca4c4d0068f2149b56b66cb25993d1ba3a14 100755
--- a/OpenAPI/TS28536_CoslaNrm.yaml
+++ b/OpenAPI/TS28536_CoslaNrm.yaml
@@ -126,45 +126,34 @@ components:
         taiList:
           $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList'
 
+#-------- Definition of types for name-containments ------
+    SubNetwork-ncO-CoslaNrm:
+      type: object
+      properties:
+        AssuranceClosedControlLoop:
+          $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple'
+ 
+    ManagedElement-ncO-CoslaNrm:
+      type: object
+      properties:
+        AssuranceClosedControlLoop:
+          $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple'
+
 #-------- Definition of concrete IOCs --------------------------------------------
     MnS:
       oneOf:
         - type: object
           properties:
             SubNetwork:
-              $ref: '#/components/schemas/SubNetwork-Multiple'
+              type: array
+              items:
+                $ref: '#/components/schemas/SubNetwork-ncO-CoslaNrm'
         - type: object
           properties:
             ManagedElement:
-              $ref: '#/components/schemas/ManagedElement-Multiple'
-
-    SubNetwork-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              allOf:
-                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'
-        - type: object
-          properties:
-            AssuranceClosedControlLoop:
-              $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple'
- 
-    ManagedElement-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              allOf:
-                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr'
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO'
-        - type: object
-          properties:
-            AssuranceClosedControlLoop:
-              $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple'
+              type: array
+              items:
+                $ref: '#/components/schemas/ManagedElement-ncO-CoslaNrm'
 
     AssuranceClosedControlLoop-Single:
       allOf:
@@ -222,16 +211,7 @@ components:
                       $ref: '#/components/schemas/AssuranceGoalStatusList'
 
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
-    SubNetwork-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/SubNetwork-Single'
-
-    ManagedElement-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/ManagedElement-Single'
-                                
+                               
     AssuranceClosedControlLoop-Multiple:
       type: array
       items:
@@ -250,5 +230,3 @@ components:
        - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single'
        - $ref: '#/components/schemas/AssuranceGoal-Single'    
        - $ref: '#/components/schemas/AssuranceReport-Single'
-       - $ref: '#/components/schemas/SubNetwork-Single'
-       - $ref: '#/components/schemas/ManagedElement-Single'
diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml
index 2b3fe3447b069211d8bfda845157ec6dd06268a9..4088b3c0aa5f70617e73c1224b7fa9ddb743856c 100644
--- a/OpenAPI/TS28538_EdgeNrm.yaml
+++ b/OpenAPI/TS28538_EdgeNrm.yaml
@@ -42,7 +42,7 @@ components:
     GeographicalCoordinates:
       type: object
       properties:
-        lattitude:
+        latitude:
           type: integer
         longitude:
           type: integer
@@ -71,7 +71,7 @@ components:
           type: integer
         virtualDisk:
           type: integer
-        virutalCPU:
+        virtualCPU:
           type: string
         vnfdId:
           type: string
@@ -97,20 +97,20 @@ components:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
     EASServicePermission:
       type: string
-      description: any of enumrated value
+      description: any of enumerated value
       enum:
         - TRIAL
         - SILVER
         - GOLD
     EASFeature:
       type: string
-      description: any of enumrated value
+      description: any of enumerated value
       enum:
         - SINGLE
         - MULTIPLE
     EASStatus:
       type: string
-      description: any of enumrated value
+      description: any of enumerated value
       enum:
         - ENABLED
         - DISABLED
@@ -159,31 +159,24 @@ components:
         resourceQuota:
           $ref: '#/components/schemas/VirtualResource'
 
+#-------- Definition of types for name-containments ------
+    SubNetwork-ncO-EdgeNrm:
+      type: object
+      properties:
+        ECSFunction:
+          $ref: '#/components/schemas/ECSFunction-Multiple'
+        EdgeDataNetwork:
+          $ref: '#/components/schemas/EdgeDataNetwork-Multiple'
+
 #-------- Definition of concrete IOCs --------------------------------------------
     MnS:
       oneOf:
         - type: object
           properties:
             SubNetwork:
-              $ref: '#/components/schemas/SubNetwork-Multiple'
-
-    SubNetwork-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              allOf:
-                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
-        - type: object
-          properties:
-            Subnetwork:
-              $ref: '#/components/schemas/SubNetwork-Multiple'
-            ECSFunction:
-              $ref: '#/components/schemas/ECSFunction-Multiple'
-            EdgeDataNetwork:
-              $ref: '#/components/schemas/EdgeDataNetwork-Multiple'
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'
+              type: array
+              items:
+                $ref: '#/components/schemas/SubNetwork-ncO-EdgeNrm'
 
     EdgeDataNetwork-Single:
       allOf:
@@ -283,7 +276,7 @@ components:
                       $ref: '#/components/schemas/SoftwareImageInfo'
                     serviceContinuitySupport:
                       type: boolean
-                    eASFunctonRef:
+                    eASFunctionRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'  
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
 
@@ -390,11 +383,7 @@ components:
 
 
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------                               
-          
-    SubNetwork-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/SubNetwork-Single'
+
     EASFunction-Multiple:
       type: array
       items:
@@ -434,7 +423,6 @@ components:
     resources-edgeNrm:
       oneOf:
         - $ref: '#/components/schemas/MnS'
-        - $ref: '#/components/schemas/SubNetwork-Single'
         - $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 b6abdbec94615e317f80fc5f27efa317b764a3f9..ade01d2d232bf6df86c2cbb43ef5c2324415ef5f 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -2816,129 +2816,114 @@ components:
         nfType:
           $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
 
+#-------- Definition of types for name-containments ------
+    SubNetwork-ncO-5GcNrm:
+      type: object
+      properties:
+        ExternalAmfFunction:
+          $ref: '#/components/schemas/ExternalAmfFunction-Multiple'
+        ExternalNrfFunction:
+          $ref: '#/components/schemas/ExternalNrfFunction-Multiple'
+        ExternalNssfFunction:
+          $ref: '#/components/schemas/ExternalNssfFunction-Multiple'
+        AmfSet:
+          $ref: '#/components/schemas/AmfSet-Multiple'
+        AmfRegion:
+          $ref: '#/components/schemas/AmfRegion-Multiple'
+        Configurable5QISet:
+          $ref: '#/components/schemas/Configurable5QISet-Multiple'
+        Dynamic5QISet:
+          $ref: '#/components/schemas/Dynamic5QISet-Multiple'
+        EcmConnectionInfo:
+          $ref: '#/components/schemas/EcmConnectionInfo-Multiple'
+
+    ManagedElement-ncO-5GcNrm:
+      type: object
+      properties:
+        AmfFunction:
+          $ref: '#/components/schemas/AmfFunction-Multiple'
+        SmfFunction:
+          $ref: '#/components/schemas/SmfFunction-Multiple'
+        UpfFunction:
+          $ref: '#/components/schemas/UpfFunction-Multiple'
+        N3iwfFunction:   
+          $ref: '#/components/schemas/N3iwfFunction-Multiple'
+        PcfFunction:
+          $ref: '#/components/schemas/PcfFunction-Multiple'
+        AusfFunction:
+          $ref: '#/components/schemas/AusfFunction-Multiple'
+        UdmFunction:
+          $ref: '#/components/schemas/UdmFunction-Multiple'
+        UdrFunction:
+          $ref: '#/components/schemas/UdrFunction-Multiple'
+        UdsfFunction:
+          $ref: '#/components/schemas/UdsfFunction-Multiple'
+        NrfFunction:
+          $ref: '#/components/schemas/NrfFunction-Multiple'
+        NssfFunction:
+          $ref: '#/components/schemas/NssfFunction-Multiple'
+        SmsfFunction:
+          $ref: '#/components/schemas/SmsfFunction-Multiple'
+        LmfFunction:
+          $ref: '#/components/schemas/LmfFunction-Multiple'
+        NgeirFunction:
+          $ref: '#/components/schemas/NgeirFunction-Multiple'
+        SeppFunction:
+          $ref: '#/components/schemas/SeppFunction-Multiple'
+        NwdafFunction:
+          $ref: '#/components/schemas/NwdafFunction-Multiple'
+        ScpFunction:
+          $ref: '#/components/schemas/ScpFunction-Multiple'
+        NefFunction:
+          $ref: '#/components/schemas/NefFunction-Multiple'
+        Configurable5QISet:
+          $ref: '#/components/schemas/Configurable5QISet-Multiple'
+        Dynamic5QISet:
+          $ref: '#/components/schemas/Dynamic5QISet-Multiple'
+        EcmConnectionInfo:
+          $ref: '#/components/schemas/EcmConnectionInfo-Multiple'
+        EASDFFunction:
+          $ref: '#/components/schemas/EASDFFunction-Multiple'
+        NSSAAFFunction:
+          $ref: '#/components/schemas/NssaafFunction-Multiple'
+        AFFunction:
+          $ref: '#/components/schemas/AfFunction-Multiple'
+        DCCFFunction:
+          $ref: '#/components/schemas/DccfFunction-Multiple'
+        ChfFunction:
+          $ref: '#/components/schemas/ChfFunction-Multiple'
+        MFAFFunction:
+          $ref: '#/components/schemas/MfafFunction-Multiple'
+        GMLCFunction:
+          $ref: '#/components/schemas/GmlcFunction-Multiple'
+        TSCTSFFunction:
+          $ref: '#/components/schemas/TsctsfFunction-Multiple'
+        AANFFunction:
+          $ref: '#/components/schemas/AanfFunction-Multiple'
+        BSFFunction:
+          $ref: '#/components/schemas/BsfFunction-Multiple'
+        MBSMFFunction:
+          $ref: '#/components/schemas/MbSmfFunction-Multiple'
+        MBUPFFunction:
+          $ref: '#/components/schemas/MbUpfFunction-Multiple'
+        MNPFFunction:
+          $ref: '#/components/schemas/MnpfFunction-Multiple'
+
 #-------- Definition of concrete IOCs --------------------------------------------
-    ProvMnS:
+    MnS:
       oneOf:
         - type: object
           properties:
             SubNetwork:
-              $ref: '#/components/schemas/SubNetwork-Multiple'
-        - type: object
-          properties:
-            ManagedElement:
-              $ref: '#/components/schemas/ManagedElement-Multiple'
-
-    SubNetwork-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              allOf:
-                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'
+              type: array
+              items:
+                $ref: '#/components/schemas/SubNetwork-ncO-5GcNrm'
         - type: object
           properties:
-            SubNetwork:
-              $ref: '#/components/schemas/SubNetwork-Multiple'
             ManagedElement:
-              $ref: '#/components/schemas/ManagedElement-Multiple'
-            ExternalAmfFunction:
-              $ref: '#/components/schemas/ExternalAmfFunction-Multiple'
-            ExternalNrfFunction:
-              $ref: '#/components/schemas/ExternalNrfFunction-Multiple'
-            ExternalNssfFunction:
-                $ref: '#/components/schemas/ExternalNssfFunction-Multiple'
-            AmfSet:
-              $ref: '#/components/schemas/AmfSet-Multiple'
-            AmfRegion:
-              $ref: '#/components/schemas/AmfRegion-Multiple'
-            Configurable5QISet:
-              $ref: '#/components/schemas/Configurable5QISet-Multiple'
-            Dynamic5QISet:
-              $ref: '#/components/schemas/Dynamic5QISet-Multiple'
-            EcmConnectionInfo:
-              $ref: '#/components/schemas/EcmConnectionInfo-Multiple'
-
-    ManagedElement-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              allOf:
-                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr'
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO'
-        - type: object
-          properties:
-            AmfFunction:
-              $ref: '#/components/schemas/AmfFunction-Multiple'
-            SmfFunction:
-              $ref: '#/components/schemas/SmfFunction-Multiple'
-            UpfFunction:
-              $ref: '#/components/schemas/UpfFunction-Multiple'
-            N3iwfFunction:   
-              $ref: '#/components/schemas/N3iwfFunction-Multiple'
-            PcfFunction:
-              $ref: '#/components/schemas/PcfFunction-Multiple'
-            AusfFunction:
-              $ref: '#/components/schemas/AusfFunction-Multiple'
-            UdmFunction:
-              $ref: '#/components/schemas/UdmFunction-Multiple'
-            UdrFunction:
-              $ref: '#/components/schemas/UdrFunction-Multiple'
-            UdsfFunction:
-              $ref: '#/components/schemas/UdsfFunction-Multiple'
-            NrfFunction:
-              $ref: '#/components/schemas/NrfFunction-Multiple'
-            NssfFunction:
-              $ref: '#/components/schemas/NssfFunction-Multiple'
-            SmsfFunction:
-              $ref: '#/components/schemas/SmsfFunction-Multiple'
-            LmfFunction:
-              $ref: '#/components/schemas/LmfFunction-Multiple'
-            NgeirFunction:
-              $ref: '#/components/schemas/NgeirFunction-Multiple'
-            SeppFunction:
-              $ref: '#/components/schemas/SeppFunction-Multiple'
-            NwdafFunction:
-              $ref: '#/components/schemas/NwdafFunction-Multiple'
-            ScpFunction:
-              $ref: '#/components/schemas/ScpFunction-Multiple'
-            NefFunction:
-              $ref: '#/components/schemas/NefFunction-Multiple'
-            Configurable5QISet:
-              $ref: '#/components/schemas/Configurable5QISet-Multiple'
-            Dynamic5QISet:
-              $ref: '#/components/schemas/Dynamic5QISet-Multiple'
-            EcmConnectionInfo:
-              $ref: '#/components/schemas/EcmConnectionInfo-Multiple'
-            EASDFFunction:
-              $ref: '#/components/schemas/EASDFFunction-Multiple'
-            NSSAAFFunction:
-              $ref: '#/components/schemas/NssaafFunction-Multiple'
-            AFFunction:
-              $ref: '#/components/schemas/AfFunction-Multiple'
-            DCCFFunction:
-              $ref: '#/components/schemas/DccfFunction-Multiple'
-            ChfFunction:
-              $ref: '#/components/schemas/ChfFunction-Multiple'
-            MFAFFunction:
-              $ref: '#/components/schemas/MfafFunction-Multiple'
-            GMLCFunction:
-              $ref: '#/components/schemas/GmlcFunction-Multiple'
-            TSCTSFFunction:
-              $ref: '#/components/schemas/TsctsfFunction-Multiple'
-            AANFFunction:
-              $ref: '#/components/schemas/AanfFunction-Multiple'
-            BSFFunction:
-              $ref: '#/components/schemas/BsfFunction-Multiple'
-            MBSMFFunction:
-              $ref: '#/components/schemas/MbSmfFunction-Multiple'
-            MBUPFFunction:
-              $ref: '#/components/schemas/MbUpfFunction-Multiple'
-            MNPFFunction:
-              $ref: '#/components/schemas/MnpfFunction-Multiple'
+              type: array
+              items:
+                $ref: '#/components/schemas/ManagedElement-ncO-5GcNrm'
 
     AmfFunction-Single:
       allOf:
@@ -5213,14 +5198,6 @@ components:
 
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
 
-    SubNetwork-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/SubNetwork-Single'
-    ManagedElement-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/ManagedElement-Single'
     AmfFunction-Multiple:
       type: array
       items:
@@ -5663,9 +5640,7 @@ components:
 
     resources-5gcNrm:
       oneOf:
-       - $ref: '#/components/schemas/ProvMnS'
-       - $ref: '#/components/schemas/SubNetwork-Single'
-       - $ref: '#/components/schemas/ManagedElement-Single'
+       - $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 dd2a8ec6d5cd9d929e2417d8fe34a9c2b8ee751d..b68eb5cf242ef536d446b30e17a3037db02ce573 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -692,6 +692,69 @@ components:
             minimum: 0
             maximum: 16777215
 
+#-------- Definition of types for name-containments ------
+    SubNetwork-ncO-NrNrm:
+      type: object
+      properties:
+        NRFrequency:
+          $ref: '#/components/schemas/NRFrequency-Multiple'
+        ExternalGnbCuCpFunction:
+          $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple'
+        ExternalENBFunction:
+          $ref: '#/components/schemas/ExternalENBFunction-Multiple'
+        EUtranFrequency:
+          $ref: '#/components/schemas/EUtranFrequency-Multiple'
+        DESManagementFunction:
+          $ref: '#/components/schemas/DESManagementFunction-Single'
+        DRACHOptimizationFunction:
+          $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
+        DMROFunction:
+          $ref: '#/components/schemas/DMROFunction-Single'
+        DLBOFunction:
+          $ref: '#/components/schemas/DLBOFunction-Single'
+        DPCIConfigurationFunction:
+          $ref: '#/components/schemas/DPCIConfigurationFunction-Single'
+        CPCIConfigurationFunction:
+          $ref: '#/components/schemas/CPCIConfigurationFunction-Single'
+        CESManagementFunction:
+          $ref: '#/components/schemas/CESManagementFunction-Single'
+        Configurable5QISet:
+          $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple'
+        RimRSGlobal:
+          $ref: '#/components/schemas/RimRSGlobal-Single'
+        Dynamic5QISet:
+          $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple'
+        CCOFunction:
+          $ref: '#/components/schemas/CCOFunction-Single'
+
+    ManagedElement-ncO-NrNrm:
+      type: object
+      properties:
+        GnbDuFunction:
+          $ref: '#/components/schemas/GnbDuFunction-Multiple'
+        GnbCuUpFunction:
+          $ref: '#/components/schemas/GnbCuUpFunction-Multiple'
+        GnbCuCpFunction:
+          $ref: '#/components/schemas/GnbCuCpFunction-Multiple'
+        DESManagementFunction:
+          $ref: '#/components/schemas/DESManagementFunction-Single'
+        DRACHOptimizationFunction:
+          $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
+        DMROFunction:
+          $ref: '#/components/schemas/DMROFunction-Single'
+        DLBOFunction:
+          $ref: '#/components/schemas/DLBOFunction-Single'
+        DPCIConfigurationFunction:
+          $ref: '#/components/schemas/DPCIConfigurationFunction-Single'
+        CPCIConfigurationFunction:
+          $ref: '#/components/schemas/CPCIConfigurationFunction-Single'
+        CESManagementFunction:
+          $ref: '#/components/schemas/CESManagementFunction-Single'
+        Configurable5QISet:
+          $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple'
+        Dynamic5QISet:
+          $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple'
+
 #-------- Definition of abstract IOCs --------------------------------------------
 
     RrmPolicy_-Attr:
@@ -702,7 +765,6 @@ components:
         rRMPolicyMemberList:
           $ref: '#/components/schemas/RrmPolicyMemberList'
 
-
 #-------- Definition of concrete IOCs --------------------------------------------
 
     MnS:
@@ -710,90 +772,15 @@ components:
         - type: object
           properties:
             SubNetwork:
-              $ref: '#/components/schemas/SubNetwork-Multiple'
-        - type: object
-          properties:
-            ManagedElement:
-              $ref: '#/components/schemas/ManagedElement-Multiple'
-
-    SubNetwork-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'
+              type: array
+              items:
+                $ref: '#/components/schemas/SubNetwork-ncO-NrNrm'
         - type: object
           properties:
-            SubNetwork:
-              $ref: '#/components/schemas/SubNetwork-Multiple'
             ManagedElement:
-              $ref: '#/components/schemas/ManagedElement-Multiple'
-            NRFrequency:
-              $ref: '#/components/schemas/NRFrequency-Multiple'
-            ExternalGnbCuCpFunction:
-              $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple'
-            ExternalENBFunction:
-              $ref: '#/components/schemas/ExternalENBFunction-Multiple'
-            EUtranFrequency:
-              $ref: '#/components/schemas/EUtranFrequency-Multiple'
-            DESManagementFunction:
-              $ref: '#/components/schemas/DESManagementFunction-Single'
-            DRACHOptimizationFunction:
-              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
-            DMROFunction:
-              $ref: '#/components/schemas/DMROFunction-Single'
-            DLBOFunction:
-              $ref: '#/components/schemas/DLBOFunction-Single'
-            DPCIConfigurationFunction:
-              $ref: '#/components/schemas/DPCIConfigurationFunction-Single'
-            CPCIConfigurationFunction:
-              $ref: '#/components/schemas/CPCIConfigurationFunction-Single'
-            CESManagementFunction:
-              $ref: '#/components/schemas/CESManagementFunction-Single'
-            Configurable5QISet:
-              $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple'
-            RimRSGlobal:
-              $ref: '#/components/schemas/RimRSGlobal-Single'
-            Dynamic5QISet:
-              $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple'
-            CCOFunction:
-              $ref: '#/components/schemas/CCOFunction-Single'
-    ManagedElement-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr'
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO'
-        - type: object
-          properties:
-            GnbDuFunction:
-              $ref: '#/components/schemas/GnbDuFunction-Multiple'
-            GnbCuUpFunction:
-              $ref: '#/components/schemas/GnbCuUpFunction-Multiple'
-            GnbCuCpFunction:
-              $ref: '#/components/schemas/GnbCuCpFunction-Multiple'
-            DESManagementFunction:
-              $ref: '#/components/schemas/DESManagementFunction-Single'
-            DRACHOptimizationFunction:
-              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
-            DMROFunction:
-              $ref: '#/components/schemas/DMROFunction-Single'
-            DLBOFunction:
-              $ref: '#/components/schemas/DLBOFunction-Single'
-            DPCIConfigurationFunction:
-              $ref: '#/components/schemas/DPCIConfigurationFunction-Single'
-            CPCIConfigurationFunction:
-              $ref: '#/components/schemas/CPCIConfigurationFunction-Single'
-            CESManagementFunction:
-              $ref: '#/components/schemas/CESManagementFunction-Single'
-            Configurable5QISet:
-              $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple'
-            Dynamic5QISet:
-              $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple'
+              type: array
+              items:
+                $ref: '#/components/schemas/ManagedElement-ncO-NrNrm'
 
     GnbDuFunction-Single:
       allOf:
@@ -2012,14 +1999,6 @@ components:
 
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
 
-    SubNetwork-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/SubNetwork-Single'
-    ManagedElement-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/ManagedElement-Single'
     GnbDuFunction-Multiple:
       type: array
       items:
@@ -2182,9 +2161,6 @@ components:
     resources-nrNrm:
       oneOf:
         - $ref: '#/components/schemas/MnS'
-        
-        - $ref: '#/components/schemas/SubNetwork-Single'
-        - $ref: '#/components/schemas/ManagedElement-Single'
 
         - $ref: '#/components/schemas/GnbDuFunction-Single'
         - $ref: '#/components/schemas/GnbCuUpFunction-Single'
diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml
index 52620a6bfd9c6e9aab0fd9f3b17bb514fc53f9bb..335ae9978ccec941d51883604f6fbce569100d72 100755
--- a/OpenAPI/TS28541_SliceNrm.yaml
+++ b/OpenAPI/TS28541_SliceNrm.yaml
@@ -783,6 +783,27 @@ components:
         - NETWORKSLICE
         - NETWORKSLICESUBNET
 
+#-------- Definition of types for name-containments ------
+    SubNetwork-ncO-SliceNrm:
+      type: object
+      properties:
+        NetworkSlice:
+          $ref: '#/components/schemas/NetworkSlice-Multiple'
+        NetworkSliceSubnet:
+          $ref: '#/components/schemas/NetworkSliceSubnet-Multiple'
+        EP_Transport:
+          $ref: '#/components/schemas/EP_Transport-Multiple'
+        NetworkSliceSubnetProviderCapabilities:
+          $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Multiple'
+        FeasibilityCheckAndReservationJob:
+          $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Multiple'
+        NetworkSliceController:
+          $ref: '#/components/schemas/NetworkSliceController-Multiple'
+        NetworkSliceSubnetController:
+          $ref: '#/components/schemas/NetworkSliceSubnetController-Multiple'
+        IsolationProfile:
+          $ref: '#/components/schemas/IsolationProfile-Multiple'
+
 #------------ Definition of concrete IOCs ----------------------------------------
 
     MnS:
@@ -790,42 +811,14 @@ components:
         - type: object
           properties:
             SubNetwork:
-              $ref: '#/components/schemas/SubNetwork-Multiple'
+              type: array
+              items:
+                $ref: '#/components/schemas/SubNetwork-ncO-SliceNrm'
 #        - type: object
 #          properties:
 #            ManagedElement:
 #              $ref: '#/components/schemas/ManagedElement-Multiple'
 
-    SubNetwork-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              allOf:
-                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
-        - $ref: 'TS28623_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'
-            NetworkSliceSubnetProviderCapabilities:
-              $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Multiple'
-            FeasibilityCheckAndReservationJob:
-              $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Multiple'
-            NetworkSliceController:
-              $ref: '#/components/schemas/NetworkSliceController-Multiple'
-            NetworkSliceSubnetController:
-              $ref: '#/components/schemas/NetworkSliceSubnetController-Multiple'
-            IsolationProfile:
-              $ref: '#/components/schemas/IsolationProfile-Multiple'
-
     NetworkSlice-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1026,10 +1019,6 @@ components:
                       $ref: 'TS28623_ComDefs.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
@@ -1076,7 +1065,6 @@ components:
       oneOf:
        - $ref: '#/components/schemas/MnS'
                
-       - $ref: '#/components/schemas/SubNetwork-Single'
        - $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 1978c3f8ac097ca0efe78e57f66691b2c89857fd..4567b9f1fe7dc9fd4ef3e39aa3f824ea3c4fc9df 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -1068,6 +1068,34 @@ components:
                   minItems: 0
                   maxItems: 2
 
+    SubNetwork-Single:
+      allOf:
+        - $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'
+        - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/SubNetwork-ncO-RanScNrm'
+        - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/SubNetwork-ncO-CoslaNrm'
+        - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/SubNetwork-ncO-EdgeNrm'
+        - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/SubNetwork-ncO-SliceNrm'
+        - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm'
+        - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm'
+
+    ManagedElement-Single:
+      allOf:
+        - $ref: '#/components/schemas/Top'
+        - $ref: '#/components/schemas/ManagedElement-Attr'
+        - $ref: '#/components/schemas/ManagedElement-ncO'
+        - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/ManagedElement-ncO-MdaNrm'
+        - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/ManagedElement-ncO-AiMlNrm'
+        - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm'
+        - $ref: 'TS28541_NrNrm.yaml#/components/schemas/ManagedElement-ncO-NrNrm'
+        - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/ManagedElement-ncO-5GcNrm'
+
 #-------- Definition of YAML arrays for name-contained IOCs ----------------------
 
     VsDataContainer-Multiple:
@@ -1134,6 +1162,14 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/QMCJob-Single'
+    SubNetwork-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/SubNetwork-Single'
+    ManagedElement-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/ManagedElement-Single'
 
 #-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
 
@@ -1167,3 +1203,6 @@ components:
        - $ref: '#/components/schemas/ConditionMonitor-Single'
        - $ref: '#/components/schemas/SupportedNotifications-Single'
        - $ref: '#/components/schemas/QMCJob-Single'
+
+       - $ref: '#/components/schemas/SubNetwork-Single'
+       - $ref: '#/components/schemas/ManagedElement-Single'