diff --git a/OpenAPI/TS28623_ExternalDataMgmtNrm.yaml b/OpenAPI/TS28623_ExternalDataMgmtNrm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8dedab4eff73a9cd9a794b4dd17650453132381f
--- /dev/null
+++ b/OpenAPI/TS28623_ExternalDataMgmtNrm.yaml
@@ -0,0 +1,81 @@
+openapi: 3.0.1
+info:
+  title: External data management NRM
+  version: 19.5.0
+  description: >-
+    OAS 3.0.1 definition of the External data type NRM fragment
+    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.623; Generic NRM, External data type NRM fragment
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
+paths: {}
+components:
+  schemas:
+  #-------- Definition of types for name-containments ------
+    SubNetwork-ncO-ExternalDataMgmtNrm:
+      type: object
+      properties:
+        ExternalDataType:
+          $ref: '#/components/schemas/ExternalDataType-Multiple'
+    
+
+#-------- Definition of types-----------------------------------------------------
+
+    ExternalDataScope:
+      type: object
+      properties:
+        geoAreas:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
+        objectInstancesIncluded:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+        objectInstancesExcluded:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+
+#-------- Definition of concrete IOCs --------------------------------------------
+
+    ExternalDataType-Single:
+      allOf:
+      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+      - type: object
+        properties:
+          attributes:
+            type: object
+            properties:
+              externalDataType:
+                type: string
+              mediaLocation: 
+                type: array
+                uniqueItems: true
+                items:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
+              externalDataTypeSchema:
+                type: string
+              externalDataScope:
+                type: array
+                uniqueItems: true
+                items:
+                  $ref: '#/components/schemas/ExternalDataScope'
+
+#-------- Definition of YAML arrays for name-contained IOCs ----------------------
+
+    ExternalDataType-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/ExternalDataType-Single'
+
+#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
+    resources-externalDataMgmtNrm:
+      oneOf:
+       - $ref: '#/components/schemas/ExternalDataType-Single'
+     
+       
diff --git a/OpenAPI/TS28623_FeatureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml
index 7a37deb97ebd5a3b233bb003c1d2c281f3047f60..ea42579329ca9e0e701ed8acd3d48e7364fd4010 100644
--- a/OpenAPI/TS28623_FeatureNrm.yaml
+++ b/OpenAPI/TS28623_FeatureNrm.yaml
@@ -37,5 +37,5 @@ components:
         - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm'
         - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm'
         - $ref: 'TS28310_EnergyInformationNrm.yaml#/components/schemas/resources-energyInformationNrm'
-
+        - $ref: 'TS28623_ExternalDataMgmtNrm.yaml#/components/schemas/resources-externalDataMgmtNrm'
 #----- Definitions in TS 28.623 for TS 28.532 --------------------------#   
diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
index 5f3a20de4375fc6da9eed558f58a2ce7974e6c28..e5fa3fc9aecba3f39a5e6b5e460cb0f90b2fe53b 100644
--- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
+++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
@@ -18,8 +18,6 @@ components:
       properties:
         ManagementDataCollection:
           $ref: '#/components/schemas/ManagementDataCollection-Multiple'
-        ExternalDataType:
-          $ref: '#/components/schemas/ExternalDataType-Multiple'
     
    #-------Definition of generic IOCs ----------# 
 
@@ -62,24 +60,6 @@ components:
           items:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
 
-    ExternalDataScope:
-      type: object
-      properties:
-        geoAreas:
-          type: array
-          uniqueItems: true
-          items:
-            $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
-        objectInstancesIncluded:
-          type: array
-          uniqueItems: true
-          items:
-            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-        objectInstancesExcluded:
-          type: array
-          uniqueItems: true
-          items:
-            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
 
 #-------- Definition of concrete IOCs --------------------------------------------
 
@@ -114,43 +94,15 @@ components:
                 jobId:
                   type: string
 
-    ExternalDataType-Single:
-      allOf:
-      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-      - type: object
-        properties:
-          attributes:
-            type: object
-            properties:
-              externalDataType:
-                type: string
-              mediaLocation: 
-                type: array
-                uniqueItems: true
-                items:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
-              externalDataTypeSchema:
-                type: string
-              externalDataScope:
-                type: array
-                uniqueItems: true
-                items:
-                  $ref: '#/components/schemas/ExternalDataScope'
-
 #-------- Definition of YAML arrays for name-contained IOCs ----------------------
     ManagementDataCollection-Multiple:
       type: array
       items:
         $ref: '#/components/schemas/ManagementDataCollection-Single'
       
-    ExternalDataType-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/ExternalDataType-Single'
 #-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
     resources-mgmtDataCollectionNrm:
       oneOf:
        - $ref: '#/components/schemas/ManagementDataCollection-Single'
-       - $ref: '#/components/schemas/ExternalDataType-Single'