diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 63895f7d74e4fe7b96d49e8efb063044d22ce209..e1f663299d52da49db159add3656b6d24fd9e8b1 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -647,9 +647,6 @@ components:
         - $ref: 'TS28623_ExternalDataMgmtNrm.yaml#/components/schemas/SubNetwork-ncO-ExternalDataMgmtNrm'
         - $ref: 'TS28561_NdtNrm.yaml#/components/schemas/SubNetwork-ncO-NDTNrm'
         - $ref: 'TS28567_CclNrm.yaml#/components/schemas/SubNetwork-ncO-CCLNrm'
-        - $ref: 'TS28623_ExternalDataMgmtNrm.yaml#/components/schemas/SubNetwork-ncO-ExternalDataMgmtNrm'
-        - $ref: 'TS28561_NdtNrm.yaml#/components/schemas/SubNetwork-ncO-NDTNrm'
-        - $ref: 'TS28567_CclNrm.yaml#/components/schemas/SubNetwork-ncO-CCLNrm'
 
     ManagedElement-Single:
       allOf:
diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml
index ac75dcdf21dc9c1aa542bc04ae7de2f487e50c2f..85c9f47d2247ec96049450397a0c8ce492d1d4ba 100644
--- a/OpenAPI/TS28623_MnSRegistryNrm.yaml
+++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml
@@ -23,43 +23,47 @@ components:
 
 #-------- Definition of types-----------------------------------------------------
     MnsCapability:
-      type: string
-      enum:
-        - NR_PROVISIONING
-        - 5GC_PROVISIONING
-        - NETWORK_SLICING_PROVISIONING
-        - EDGE_COMPUTING_PROVISIONING
-        - PERFORMANCE_METRIC_COLLECTION_CONTROL
-        - PERFORMANCE_METRIC_DATA_REPORT
-        - PERFORMANCE_METRIC_THRESHOLD_MONITOR_CONTROL
-        - PERFORMANCE_METRIC_THRESHOLD_NOTIFICATION
-        - FAULT_CONTROL
-        - FAULT_NOTIFICATION
-        - TRACE_MDT_DATA_COLLECTION_CONTROL
-        - TRACE_MDT_DATA_REPORT
-        - STM_PROVISIONING
-        - STM_STREAMING
-        - QOE_DATA_COLLECTION_CONTROL
-        - QOE_DATA_REPORT
-        - FILE_RETRIEVAL
-        - FILE_DOWNLOAD
-        - CONFIGURATION_PLAN_MGMT
-        - SUBSCRIPTION_CONTROL
-        - HEARTBEAT_CONTROL
-        - HEARTBEAT_NOTIFICATION
-        - MANAGEMENT_DATA_ANALYTIC
-        - RANSC_MANAGEMENT
-        - SON_POLICY
-        - COMMUNICATION_SERVICE_ASSURANCE_CONTROL
-        - CLOSED_CONTROL_LOOP_MANAGEMENT
-        - INTENT_DRIVEN_MANAGEMENT
-        - ML_MODEL_MANAGEMENT
-        - NDT_LCM
-        - MNS_REGISTRY_AND_DISCOVERY
-        - MGMTDATA_REGISTRY_AND_DISCOVERY
-        - MNS_ACCESS_CONTROL_MANAGEMENT
-        - DSO_RAPID_RECOVERY_AND_THRESHOLD_MONITORING
-        - EXTERNALDATA_DISCOVERY_AND_REQUEST
+      oneOf:
+        - type: string
+          enum:
+            - NR_PROVISIONING
+            - 5GC_PROVISIONING
+            - NETWORK_SLICING_PROVISIONING
+            - EDGE_COMPUTING_PROVISIONING
+            - PERFORMANCE_METRIC_COLLECTION_CONTROL
+            - PERFORMANCE_METRIC_DATA_REPORT
+            - PERFORMANCE_METRIC_THRESHOLD_MONITOR_CONTROL
+            - PERFORMANCE_METRIC_THRESHOLD_NOTIFICATION
+            - FAULT_CONTROL
+            - FAULT_NOTIFICATION
+            - TRACE_MDT_DATA_COLLECTION_CONTROL
+            - TRACE_MDT_DATA_REPORT
+            - STM_PROVISIONING
+            - STM_STREAMING
+            - QOE_DATA_COLLECTION_CONTROL
+            - QOE_DATA_REPORT
+            - FILE_RETRIEVAL
+            - FILE_DOWNLOAD
+            - CONFIGURATION_PLAN_MGMT
+            - SUBSCRIPTION_CONTROL
+            - HEARTBEAT_CONTROL
+            - HEARTBEAT_NOTIFICATION
+            - MANAGEMENT_DATA_ANALYTIC
+            - RANSC_MANAGEMENT
+            - SON_POLICY
+            - COMMUNICATION_SERVICE_ASSURANCE_CONTROL
+            - CLOSED_CONTROL_LOOP_MANAGEMENT
+            - INTENT_DRIVEN_MANAGEMENT
+            - ML_MODEL_MANAGEMENT
+            - NDT_LCM
+            - MNS_REGISTRY_AND_DISCOVERY
+            - MGMTDATA_REGISTRY_AND_DISCOVERY
+            - MNS_ACCESS_CONTROL_MANAGEMENT
+            - DSO_RAPID_RECOVERY_AND_THRESHOLD_MONITORING
+            - EXTERNALDATA_DISCOVERY_AND_REQUEST
+        - type: string
+          description: >- 
+            It is used to represent the vendor extension values.
 #-------- Definition of concrete IOCs --------------------------------------------          
     MnsRegistry-Single:
       allOf: