diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index b0d7caec8f6d95c30e7c17e015cd173dabed2ef8..e5d16a1949db3526a0c9591819064a929c9c617a 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -1774,13 +1774,6 @@ components:
         TraceJob:
           $ref: '#/components/schemas/TraceJob-Multiple'
 
-    MnsRegistry-Single:
-      type: object
-      properties:
-        MnsInfo:
-          $ref: '#/components/schemas/MnsInfo-Multiple'
-
-
 #-------- Definition of concrete IOCs --------------------------------------------
 
     VsDataContainer-Single:
@@ -2077,32 +2070,42 @@ components:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                 jobId:
                   type: string
+    MnsRegistry-Single:
+      allOf:
+        - $ref: '#/components/schemas/Top'
+        - type: object
+          properties:
+            MnsInfo:
+              $ref: '#/components/schemas/MnsInfo-Multiple'
+
     MnsInfo-Single:
-      type: object
-      properties:
-        mnsLabel:
-          type: string
-        mnsType:
-          type: string
-          enum:
-            - ProvMnS
-            - FaultSupervisionMnS
-            - StreamingDataReportingMnS
-            - FileDataReportingMnS
-        mnsVersion:
-          type: string
-        mnsAddress:
-          description: Resource URI as defined in the relevant Technical Specification
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
-        mnsScope:
-          description: >-
-            List of the managed object instances that can be accessed using the MnS.
-            If a complete SubNetwork can be accessed using the MnS, this attribute may contain the
-            DN of the SubNetwork instead of the DNs of the individual managed entities within the
-            SubNetwork.
-          type: array
-          items:
-            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+      allOf:
+        - $ref: '#/components/schemas/Top'
+        - type: object
+          properties:
+             mnsLabel:
+               type: string
+             mnsType:
+               type: string
+               enum:
+                 - ProvMnS
+                 - FaultSupervisionMnS
+                 - StreamingDataReportingMnS
+                 - FileDataReportingMnS
+             mnsVersion:
+               type: string
+             mnsAddress:
+               description: Resource URI as defined in the relevant Technical Specification
+               $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
+             mnsScope:
+               description: >-
+                 List of the managed object instances that can be accessed using the MnS.
+                 If a complete SubNetwork can be accessed using the MnS, this attribute may 
+                 contain the DN of the SubNetwork instead of the DNs of the individual managed 
+                 entities within the SubNetwork.
+               type: array
+               items:
+                 $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
 
 #-------- Definition of YAML arrays for name-contained IOCs ----------------------