diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index 12571c2bd097ed2bc48431b1a2dd3e8d4cd24eee..81c5de572c563029ac29cf5dc5a6bba666454a97 100644
--- a/OpenAPI/TS28105_AiMlNrm.yaml
+++ b/OpenAPI/TS28105_AiMlNrm.yaml
@@ -70,7 +70,7 @@ components:
         thresholdList:
           type: array
           items:
-            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdInfo'
+            $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdInfo'
 
     SupportedPerfIndicator:
       type: object
@@ -201,7 +201,7 @@ components:
             MLTrainingReport:
               $ref: '#/components/schemas/MLTrainingReport-Multiple'
             ThresholdMonitors:
-              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
+              $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
 
     MLTrainingRequest-Single:
       allOf:
diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml
index 3c5e2640d561cacdc3b0af4d9ec700f3f5cb694b..b714bf3071bb530b2aaae883d492a6c7584bfa25 100644
--- a/OpenAPI/TS28318_DsoNrm.yaml
+++ b/OpenAPI/TS28318_DsoNrm.yaml
@@ -77,7 +77,7 @@ components:
               $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
     DsoThresholdMonitor-Single:
       allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor-Single'
+        - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Single'
         - type: object
           properties:
             targetThresholdLocation:
diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml
index 22f62acb204e5120ccc57548b43b55ac0b5e375e..7ecf315f352d59c97743e225488e6ebf9ff9a5d8 100755
--- a/OpenAPI/TS28532_ProvMnS.yaml
+++ b/OpenAPI/TS28532_ProvMnS.yaml
@@ -428,7 +428,15 @@ components:
             - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm'
             - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm'                           
             - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm'
-            - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNrm'
+            - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNrm'   
+            - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/resources-fileMgmtNrm'
+            - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm'
+            - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm'     
+            - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm'      
+            - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' 
+            - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm'  
+            - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm'   
+            - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm'                                                                                                              
             - $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm'
     Scope:
       type: object
diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6cdfde23ee47e4873a2eb5f239fd6defb213a53b
--- /dev/null
+++ b/OpenAPI/TS28623_FileManagementNrm.yaml
@@ -0,0 +1,157 @@
+openapi: 3.0.1
+info:
+  title: File Management NRM
+  version: 18.6.0
+  description: >-
+    OAS 3.0.1 definition of the File Management NRM fragment
+    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.623; Generic NRM, File Management NRM 
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
+paths: {}
+components:
+  schemas:
+#-------- Definition of types-----------------------------------------------------
+    FileDownloadJobProcessMonitor:
+      description: >-
+        This data type is the "ProcessMonitor" data type with specialisations
+        for usage in the "FileDownloadJob".
+      type: object
+      properties:
+        jobId:
+          type: string
+        status:
+          type: string
+          enum:
+            - NOT_STARTED
+            - RUNNING
+            - FINSHED
+            - FAILED
+            - CANCELLING
+            - CANCELLED
+        progressPercentage:
+          type: integer
+          minimum: 0
+          maximum: 100
+        progressStateInfo:
+          type: string
+        resultStateInfo:
+          oneOf:
+            - type: string
+              enum:
+                - NULL
+                - UNKNOWN
+                - NO_STORAGE
+                - LOW_MEMROY
+                - NO_CONNECTION_TO_REMOTE_SERVER
+                - FILE_NOT_AVAILABLE
+                - DNS_CANNOT_BE_RESOLVED
+                - TIMER_EXPIRED
+                - OTHER
+            - type: string
+        startTime:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+        endTime:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+        timer:
+          type: integer
+
+#-------- Definition of concrete IOCs --------------------------------------------
+
+
+    FileDownloadJob-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                fileLocation:
+                  type: string
+                notificationRecipientAddress:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
+                cancelJob:
+                  type: string
+                  enum:
+                    - TRUE
+                    - FALSE
+                jobMonitor:
+                  $ref: '#/components/schemas/FileDownloadJobProcessMonitor'
+    Files-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                numberOfFiles:
+                  type: integer
+                jobRef:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                jobId:
+                  type: string
+                File:
+                  $ref: '#/components/schemas/File-Multiple'
+    File-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                fileLocation:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
+                fileCompression:
+                  type: string
+                fileSize:
+                  type: integer
+                fileDataType:
+                  type: string
+                  enum:
+                    - PERFORMANCE
+                    - TRACE
+                    - ANALYTICS
+                    - PROPRIETARY
+                fileFormat:
+                  type: string
+                fileReadyTime:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+                fileExpirationTime:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+                fileContent:
+                  type: string
+                jobRef:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                jobId:
+                  type: string
+ 
+            
+
+#-------- Definition of YAML arrays for name-contained IOCs ----------------------
+
+    FileDownloadJob-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/FileDownloadJob-Single'
+    Files-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/Files-Single'
+    File-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/File-Single'
+
+
+
+#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
+    resources-fileMgmtNrm:
+      oneOf:
+       - $ref: '#/components/schemas/FileDownloadJob-Single'
+       - $ref: '#/components/schemas/Files-Single'    
+       - $ref: '#/components/schemas/File-Single'
+       
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 6b6b09f21530766ad0ee31034d4684a261429f92..227efce45c20a499f462603bbf634d628a43d56e 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -51,30 +51,6 @@ components:
           type: string
         powerInterface:
           type: string
-    ThresholdInfo:
-      type: object
-      properties:
-        performanceMetrics:
-          type: array
-          items:
-            type: string
-        thresholdDirection:
-          type: string
-          enum:
-            - UP
-            - DOWN
-            - UP_AND_DOWN
-        thresholdValue:
-          oneOf:
-            - type: integer
-            - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float'
-        hysteresis:
-          oneOf:
-            - type: integer
-              minimum: 0
-            - type: number
-              format: float
-              minimum: 0
     Operation:
       type: object
       properties:
@@ -273,49 +249,6 @@ components:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
         timer:
           type: integer
-    FileDownloadJobProcessMonitor:
-      description: >-
-        This data type is the "ProcessMonitor" data type with specialisations
-        for usage in the "FileDownloadJob".
-      type: object
-      properties:
-        jobId:
-          type: string
-        status:
-          type: string
-          enum:
-            - NOT_STARTED
-            - RUNNING
-            - FINSHED
-            - FAILED
-            - CANCELLING
-            - CANCELLED
-        progressPercentage:
-          type: integer
-          minimum: 0
-          maximum: 100
-        progressStateInfo:
-          type: string
-        resultStateInfo:
-          oneOf:
-            - type: string
-              enum:
-                - NULL
-                - UNKNOWN
-                - NO_STORAGE
-                - LOW_MEMROY
-                - NO_CONNECTION_TO_REMOTE_SERVER
-                - FILE_NOT_AVAILABLE
-                - DNS_CANNOT_BE_RESOLVED
-                - TIMER_EXPIRED
-                - OTHER
-            - type: string
-        startTime:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
-        endTime:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
-        timer:
-          type: integer
     AreaScope:
       oneOf:
       - type: array
@@ -357,37 +290,6 @@ components:
         - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
         - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
 
-    ManagementData:
-      oneOf:
-      - type: array
-        items:
-          type: string
-          enum:
-            - COVERAGE
-            - CAPACITY
-            - ENERGY_EFFICIENCY
-            - MOBILITY
-            - ACCESSIBILITY
-      - type: array
-        items:
-          type: string
-    NodeFilter:
-      type: object
-      properties:
-        areaOfInterest:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest'
-        networkDomain:
-          type: string
-          enum:
-            - CN
-            - RAN
-        cpUpType:
-          type: string
-          enum:
-            - CP
-            - UP
-        sst:
-          type: integer
     SchedulingTime:
       oneOf:
         - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
@@ -542,23 +444,23 @@ components:
         MeContext:
           $ref: '#/components/schemas/MeContext-Multiple'
         PerfMetricJob:
-          $ref: '#/components/schemas/PerfMetricJob-Multiple'
+          $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple'
         ThresholdMonitor:
-          $ref: '#/components/schemas/ThresholdMonitor-Multiple'
+          $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
         TraceJob:
           $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple'
         ManagementDataCollection:
-          $ref: '#/components/schemas/ManagementDataCollection-Multiple'
+          $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementDataCollection-Multiple'
         NtfSubscriptionControl:
-          $ref: '#/components/schemas/NtfSubscriptionControl-Multiple'
+          $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple'
         AlarmList:
           $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single'
         FileDownloadJob:
-          $ref: '#/components/schemas/FileDownloadJob-Multiple'
+          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple'
         Files:
-          $ref: '#/components/schemas/Files-Multiple'
+          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple'
         MnsRegistry:
-          $ref: '#/components/schemas/MnsRegistry-Single'
+          $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/MnsRegistry-Single'
         Scheduler:
           $ref: '#/components/schemas/Scheduler-Multiple'
         ConditionMonitor:
@@ -566,7 +468,7 @@ components:
         SupportedNotifications:
           $ref: '#/components/schemas/SupportedNotifications-Single'
         QMCJobs:
-          $ref: '#/components/schemas/QMCJob-Multiple'
+          $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple'
 
     ManagedElement-ncO:
       type: object
@@ -574,19 +476,19 @@ components:
         MnsAgent:
           $ref: '#/components/schemas/MnsAgent-Multiple'
         PerfMetricJob:
-          $ref: '#/components/schemas/PerfMetricJob-Multiple'
+          $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple'
         ThresholdMonitor:
-          $ref: '#/components/schemas/ThresholdMonitor-Multiple'
+          $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
         TraceJob:
           $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple'
         NtfSubscriptionControl:
-          $ref: '#/components/schemas/NtfSubscriptionControl-Multiple'
+          $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple'
         AlarmList:
           $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single'
         FileDownloadJob:
-          $ref: '#/components/schemas/FileDownloadJob-Multiple'
+          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple'
         Files:
-          $ref: '#/components/schemas/Files-Multiple'
+          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple'
         Scheduler:
           $ref: '#/components/schemas/Scheduler-Multiple'
         ConditionMonitor:
@@ -594,7 +496,7 @@ components:
         SupportedNotifications:  
           $ref: '#/components/schemas/SupportedNotifications-Single'
         QMCJobs:
-          $ref: '#/components/schemas/QMCJob-Multiple'
+          $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple'
 
 #-------- Definition of abstract IOCs --------------------------------------------
 
@@ -637,9 +539,9 @@ components:
       type: object
       properties:
         PerfMetricJob:
-          $ref: '#/components/schemas/PerfMetricJob-Multiple'
+          $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple'
         ThresholdMonitor:
-          $ref: '#/components/schemas/ThresholdMonitor-Multiple'
+          $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
         ManagedNFService:
           $ref: '#/components/schemas/ManagedNFService-Multiple'
         TraceJob:
@@ -731,225 +633,6 @@ components:
               properties:
                 dnPrefix:
                   type: string
-    PerfMetricJob-Single:
-      allOf:
-        - $ref: '#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              type: object
-              not:
-                required: [ conditionMonitorRef, schedulerRef ]
-              properties:
-                administrativeState:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
-                operationalState:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'
-                jobId:
-                  type: string
-                performanceMetrics:
-                  type: array
-                  items:
-                    type: string
-                granularityPeriod:
-                  type: integer
-                  minimum: 1
-                objectInstances:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
-                rootObjectInstances:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
-                conditionMonitorRef:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-                schedulerRef:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-                reportingCtrl:
-                  $ref: '#/components/schemas/ReportingCtrl'
-            Files:
-              $ref: '#/components/schemas/Files-Multiple'
-
-    ThresholdMonitor-Single:
-      allOf:
-        - $ref: '#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              type: object
-              properties:
-                administrativeState:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
-                operationalState:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'
-                thresholdInfoList:
-                  type: array
-                  items:
-                    $ref: '#/components/schemas/ThresholdInfo'
-                monitorGranularityPeriod:
-                  type: integer
-                  minimum: 1
-                objectInstances:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
-                rootObjectInstances:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
-    NtfSubscriptionControl-Single:
-      allOf:
-        - $ref: '#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              type: object
-              properties:
-                notificationRecipientAddress:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
-                notificationTypes:
-                  type: array
-                  items:
-                    $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType'
-                scope:
-                  $ref: '#/components/schemas/Scope'
-                notificationFilter:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter'                
-            HeartbeatControl:
-              $ref: '#/components/schemas/HeartbeatControl-Single'
-    HeartbeatControl-Single:
-      allOf:
-        - $ref: '#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              type: object
-              properties:
-                heartbeatNtfPeriod:
-                  type: integer
-                  minimum: 0
-                triggerHeartbeatNtf:
-                  type: boolean
-
-    ManagementDataCollection-Single:
-      allOf:
-        - $ref: '#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              type: object
-              properties:
-                managementData:
-                  $ref: '#/components/schemas/ManagementData'
-                targetNodeFilter:
-                  $ref: '#/components/schemas/NodeFilter'
-                collectionTimeWindow:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
-                reportingCtrl:
-                  $ref: '#/components/schemas/ReportingCtrl'
-                dataScope:
-                  type: string
-                  enum:
-                    - SNSSAI
-                    - 5QI
-                    - PLMN
-    FileDownloadJob-Single:
-      allOf:
-        - $ref: '#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              type: object
-              properties:
-                fileLocation:
-                  type: string
-                notificationRecipientAddress:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
-                cancelJob:
-                  type: string
-                  enum:
-                    - TRUE
-                    - FALSE
-                jobMonitor:
-                  $ref: '#/components/schemas/FileDownloadJobProcessMonitor'
-    Files-Single:
-      allOf:
-        - $ref: '#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              type: object
-              properties:
-                numberOfFiles:
-                  type: integer
-                jobRef:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-                jobId:
-                  type: string
-                File:
-                  $ref: '#/components/schemas/File-Multiple'
-    File-Single:
-      allOf:
-        - $ref: '#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              type: object
-              properties:
-                fileLocation:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
-                fileCompression:
-                  type: string
-                fileSize:
-                  type: integer
-                fileDataType:
-                  type: string
-                  enum:
-                    - PERFORMANCE
-                    - TRACE
-                    - ANALYTICS
-                    - PROPRIETARY
-                fileFormat:
-                  type: string
-                fileReadyTime:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
-                fileExpirationTime:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
-                fileContent:
-                  type: string
-                jobRef:
-                  $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:
-      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'
     Scheduler-Single:
       allOf:
         - $ref: '#/components/schemas/Top'
@@ -999,51 +682,6 @@ components:
                       - HTTP_VES_ENCAPS
                     minItems: 1
 
-    QMCJob-Single:
-      allOf:
-        - $ref: '#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              type: object
-              properties:
-                serviceType:
-                  type: string
-                  enum:
-                    - DASH
-                    - MTSI
-                    - VR
-                areaScope:
-                  type: array
-                  items:
-                    $ref: '#/components/schemas/AreaScope'
-                qoECollectionEntityAddress:
-                  $ref: '#/components/schemas/IpAddr'
-                pLMNTarget:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
-                qoETarget:
-                  type: string
-                qoEReference:
-                  type: string
-                jobId:
-                  type: string
-                sliceScope:
-                  type: array
-                  items:
-                    $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
-                qMCConfigFile:
-                  type: string
-                mDTAlignmentInformation:
-                  $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/traceReference-Type'
-                availableRANqoEMetrics:
-                  type: array
-                  items:
-                    type: string
-                    enum:
-                      - APPLAYERBUFFERLEVELLIST
-                      - PLAYOUTDELAYFORMEDIA_STARTUP
-                  minItems: 0
-                  maxItems: 2
 
     SubNetwork-Single:
       allOf:
@@ -1095,38 +733,6 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/MeContext-Single'
-    PerfMetricJob-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/PerfMetricJob-Single'
-    ThresholdMonitor-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/ThresholdMonitor-Single'
-    ManagementDataCollection-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/ManagementDataCollection-Single'
-    NtfSubscriptionControl-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/NtfSubscriptionControl-Single'
-    FileDownloadJob-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/FileDownloadJob-Single'
-    Files-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/Files-Single'
-    File-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/File-Single'
-    MnsInfo-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/MnsInfo-Single'
     Scheduler-Multiple:
       type: array
       items:
@@ -1135,10 +741,6 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/ConditionMonitor-Single'
-    QMCJob-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/QMCJob-Single'
     SubNetwork-Multiple:
       type: array
       items:
@@ -1148,38 +750,19 @@ components:
       items:
         $ref: '#/components/schemas/ManagedElement-Single'
 
+
 #-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
 
     resources-genericNrm:
       oneOf:
 
        - $ref: '#/components/schemas/VsDataContainer-Single'
-
        - $ref: '#/components/schemas/ManagementNode-Single'
        - $ref: '#/components/schemas/MnsAgent-Single'
        - $ref: '#/components/schemas/MeContext-Single'
-
        - $ref: '#/components/schemas/ManagedNFService-Single'
-
-       - $ref: '#/components/schemas/PerfMetricJob-Single'
-       - $ref: '#/components/schemas/ThresholdMonitor-Single'
-       - $ref: '#/components/schemas/ManagementDataCollection-Single'
-       
-       - $ref: '#/components/schemas/NtfSubscriptionControl-Single'
-       - $ref: '#/components/schemas/HeartbeatControl-Single'
-
-       - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single'
-
-       - $ref: '#/components/schemas/FileDownloadJob-Single'
-       - $ref: '#/components/schemas/Files-Single'
-       - $ref: '#/components/schemas/File-Single'
-       
-       - $ref: '#/components/schemas/MnsRegistry-Single'
-       - $ref: '#/components/schemas/MnsInfo-Single'
        - $ref: '#/components/schemas/Scheduler-Single'
        - $ref: '#/components/schemas/ConditionMonitor-Single'
-       - $ref: '#/components/schemas/SupportedNotifications-Single'
-       - $ref: '#/components/schemas/QMCJob-Single'
-
+       - $ref: '#/components/schemas/SupportedNotifications-Single' 
        - $ref: '#/components/schemas/SubNetwork-Single'
        - $ref: '#/components/schemas/ManagedElement-Single'
diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..185272364845362b9300407f310bcb572f64d26c
--- /dev/null
+++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
@@ -0,0 +1,84 @@
+openapi: 3.0.1
+info:
+  title: Management Data Collection NRM
+  version: 18.6.0
+  description: >-
+    OAS 3.0.1 definition of the Management Data Collection NRM fragment
+    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.623; Generic NRM, Management Data Collection NRM
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
+paths: {}
+components:
+  schemas:
+#-------- Definition of types-----------------------------------------------------
+
+    ManagementData:
+      oneOf:
+      - type: array
+        items:
+          type: string
+          enum:
+            - COVERAGE
+            - CAPACITY
+            - ENERGY_EFFICIENCY
+            - MOBILITY
+            - ACCESSIBILITY
+      - type: array
+        items:
+          type: string
+    NodeFilter:
+      type: object
+      properties:
+        areaOfInterest:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest'
+        networkDomain:
+          type: string
+          enum:
+            - CN
+            - RAN
+        cpUpType:
+          type: string
+          enum:
+            - CP
+            - UP
+        sst:
+          type: integer
+#-------- Definition of concrete IOCs --------------------------------------------
+
+    ManagementDataCollection-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                managementData:
+                  $ref: '#/components/schemas/ManagementData'
+                targetNodeFilter:
+                  $ref: '#/components/schemas/NodeFilter'
+                collectionTimeWindow:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
+                reportingCtrl:
+                  $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ReportingCtrl'
+                dataScope:
+                  type: string
+                  enum:
+                    - SNSSAI
+                    - 5QI
+                    - PLMN
+
+#-------- Definition of YAML arrays for name-contained IOCs ----------------------
+    ManagementDataCollection-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/ManagementDataCollection-Single'
+
+#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
+    resources-mgmtDataCollectionNrm:
+      oneOf:
+       - $ref: '#/components/schemas/ManagementDataCollection-Single'
+     
+       
diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a5a022a43f8b576e39191a012fce3acccae370d9
--- /dev/null
+++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml
@@ -0,0 +1,67 @@
+openapi: 3.0.1
+info:
+  title: MnS Registry NRM
+  version: 18.6.0
+  description: >-
+    OAS 3.0.1 definition of the MnS Registry NRM fragment
+    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.623; Generic NRM, MnS Registry NRM
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
+paths: {}
+components:
+  schemas:
+#-------- Definition of types-----------------------------------------------------
+
+#-------- Definition of concrete IOCs --------------------------------------------          
+    MnsRegistry-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            MnsInfo:
+              $ref: '#/components/schemas/MnsInfo-Multiple'
+
+    MnsInfo-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/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 ----------------------
+
+    MnsInfo-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/MnsInfo-Single'
+
+
+#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
+    resources-mnSRegistryNrm:
+      oneOf:
+       - $ref: '#/components/schemas/MnsInfo-Single'
+       - $ref: '#/components/schemas/MnsRegistry-Single'
diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..23581d77711c1ee2a42c43c17f6ff70ea80a265c
--- /dev/null
+++ b/OpenAPI/TS28623_PmControlNrm.yaml
@@ -0,0 +1,64 @@
+openapi: 3.0.1
+info:
+  title: PM control NRM 
+  version: 18.6.0
+  description: >-
+    OAS 3.0.1 definition of the PM control NRM fragment
+    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.623; Generic NRM,PM control NRM
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
+paths: {}
+components:
+  schemas:
+#-------- Definition of types-----------------------------------------------------
+
+
+#-------- Definition of concrete IOCs --------------------------------------------                          
+    PerfMetricJob-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              not:
+                required: [ conditionMonitorRef, schedulerRef ]
+              properties:
+                administrativeState:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
+                operationalState:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'
+                jobId:
+                  type: string
+                performanceMetrics:
+                  type: array
+                  items:
+                    type: string
+                granularityPeriod:
+                  type: integer
+                  minimum: 1
+                objectInstances:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+                rootObjectInstances:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+                conditionMonitorRef:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                schedulerRef:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                reportingCtrl:
+                  $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ReportingCtrl'
+            Files:
+              $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple'
+
+#-------- Definition of YAML arrays for name-contained IOCs ----------------------
+    PerfMetricJob-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/PerfMetricJob-Single'
+
+#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
+    resources-pmControlNrm:
+      oneOf:
+       - $ref: '#/components/schemas/PerfMetricJob-Single'
diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ddcbe983d501c65a6f9d5b1e012e9ff2cab551d1
--- /dev/null
+++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml
@@ -0,0 +1,75 @@
+openapi: 3.0.1
+info:
+  title: QoE Measurement Collection NRMt 
+  version: 18.6.0
+  description: >-
+    OAS 3.0.1 definition of the QoE Measurement Collection NRM
+    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.623; Generic NRM,QoE Measurement Collection NRM fragment
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
+paths: {}
+components:
+  schemas:
+#-------- Definition of types-----------------------------------------------------
+
+#-------- Definition of concrete IOCs --------------------------------------------
+    QMCJob-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                serviceType:
+                  type: string
+                  enum:
+                    - DASH
+                    - MTSI
+                    - VR
+                areaScope:
+                  type: array
+                  items:
+                    $ref: 'TS28623_GenericNrm.yaml#/components/schemas/AreaScope'
+                qoECollectionEntityAddress:
+                  $ref: 'TS28623_GenericNrm.yaml#/components/schemas/IpAddr'
+                pLMNTarget:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
+                qoETarget:
+                  type: string
+                qoEReference:
+                  type: string
+                jobId:
+                  type: string
+                sliceScope:
+                  type: array
+                  items:
+                    $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
+                qMCConfigFile:
+                  type: string
+                mDTAlignmentInformation:
+                  $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/traceReference-Type'
+                availableRANqoEMetrics:
+                  type: array
+                  items:
+                    type: string
+                    enum:
+                      - APPLAYERBUFFERLEVELLIST
+                      - PLAYOUTDELAYFORMEDIA_STARTUP
+                  minItems: 0
+                  maxItems: 2
+
+
+#-------- Definition of YAML arrays for name-contained IOCs ----------------------
+
+    QMCJob-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/QMCJob-Single'
+
+#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
+    resources-qoEMeasuremetCollectionNrm:
+      oneOf:
+       - $ref: '#/components/schemas/QMCJob-Single'
diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..750d318331e881f9a1a03aa03cca16ab5a93ebe4
--- /dev/null
+++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
@@ -0,0 +1,75 @@
+openapi: 3.0.1
+info:
+  title: Subscription Control NRM
+  version: 18.2.0
+  description: >-
+    OAS 3.0.1 definition of the Subscription Control NRM fragment
+    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.623; Generic NRM, Subscription Control NRM
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
+paths: {}
+components:
+  schemas:
+#-------- Definition of types-----------------------------------------------------
+    Scope:
+      type: object
+      properties:
+        scopeType:
+          type: string
+          enum:
+            - BASE_ONLY
+            - BASE_ALL
+            - BASE_NTH_LEVEL
+            - BASE_SUBTREE
+        scopeLevel:
+          type: integer
+
+#-------- Definition of concrete IOCs --------------------------------------------         
+    NtfSubscriptionControl-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                notificationRecipientAddress:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
+                notificationTypes:
+                  type: array
+                  items:
+                    $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType'
+                scope:
+                  $ref: '#/components/schemas/Scope'
+                notificationFilter:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter'                
+            HeartbeatControl:
+              $ref: '#/components/schemas/HeartbeatControl-Single'
+    HeartbeatControl-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                heartbeatNtfPeriod:
+                  type: integer
+                  minimum: 0
+                triggerHeartbeatNtf:
+                  type: boolean
+
+#-------- Definition of YAML arrays for name-contained IOCs ----------------------
+    NtfSubscriptionControl-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/NtfSubscriptionControl-Single'
+
+
+#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
+    resources-subscriptionControlNrm:
+      oneOf:
+       - $ref: '#/components/schemas/NtfSubscriptionControl-Single'
+       - $ref: '#/components/schemas/HeartbeatControl-Single'       
\ No newline at end of file
diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d4fd1aac13b8626765a66fec90517223ecfea802
--- /dev/null
+++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml
@@ -0,0 +1,76 @@
+openapi: 3.0.1
+info:
+  title: Threshold Monitor NRM 
+  version: 18.2.0
+  description: >-
+    OAS 3.0.1 definition of the Threshold Monitor NRM fragment
+    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.623; Generic NRM,Threshold Monitor NRM 
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
+paths: {}
+components:
+  schemas:
+#-------- Definition of types-----------------------------------------------------
+    ThresholdInfo:
+      type: object
+      properties:
+        performanceMetrics:
+          type: array
+          items:
+            type: string
+        thresholdDirection:
+          type: string
+          enum:
+            - UP
+            - DOWN
+            - UP_AND_DOWN
+        thresholdValue:
+          oneOf:
+            - type: integer
+            - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float'
+        hysteresis:
+          oneOf:
+            - type: integer
+              minimum: 0
+            - type: number
+              format: float
+
+
+#-------- Definition of concrete IOCs --------------------------------------------
+    ThresholdMonitor-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                administrativeState:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
+                operationalState:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'
+                thresholdInfoList:
+                  type: array
+                  items:
+                    $ref: '#/components/schemas/ThresholdInfo'
+                monitorGranularityPeriod:
+                  type: integer
+                  minimum: 1
+                objectInstances:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+                rootObjectInstances:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+
+
+#-------- Definition of YAML arrays for name-contained IOCs ----------------------
+    ThresholdMonitor-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/ThresholdMonitor-Single'
+
+#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
+    resources-thresholdMonitorNrm:
+      oneOf:
+       - $ref: '#/components/schemas/ThresholdMonitor-Single'
diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml
index 20451d95f7de763c344dd4c2f63d82c18f86459f..5b78b2471135490d2aa4633eecc0a47de7b14057 100644
--- a/OpenAPI/TS28623_TraceControlNrm.yaml
+++ b/OpenAPI/TS28623_TraceControlNrm.yaml
@@ -7,7 +7,7 @@ info:
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
-  description: 3GPP TS 28.623; Generic NRM:Trace Control NRM
+  description: 3GPP TS 28.623; Generic NRM,Trace Control NRM
   url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
 paths: {}
 components:
@@ -1478,7 +1478,7 @@ components:
             attributes:
               $ref: '#/components/schemas/TraceJob-Attr'
             Files:
-              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Files-Multiple'
+              $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple'
 
 #-------- Definition of YAML arrays for name-contained IOCs ----------------------
 
@@ -1487,6 +1487,6 @@ components:
       items:
         $ref: '#/components/schemas/TraceJob-Single'
 #-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
-    resources-TraceControlNrm:
+    resources-traceControlNrm:
       oneOf:
        - $ref: '#/components/schemas/TraceJob-Single'