diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
index d5ab9f7e66234586717cc0aafc6f29a49ef9ad49..2634c7773de779d9f36f9aca2db8c297891ce18e 100644
--- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
+++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
@@ -27,16 +27,22 @@ components:
       oneOf:
       - type: array
         items:
-          type: string
-          enum:
-            - COVERAGE
-            - CAPACITY
-            - ENERGY_EFFICIENCY
-            - MOBILITY
-            - ACCESSIBILITY
+          $ref: '#/components/schemas/mgtDataCategory'
+        uniqueItems: true  
       - type: array
         items:
-          type: string
+          $ref: '#/components/schemas/mgtDataName'
+        uniqueItems: true  
+    mgtDataCategory:
+      type: string
+      enum:
+        - COVERAGE
+        - CAPACITY
+        - ENERGY_EFFICIENCY
+        - MOBILITY
+        - ACCESSIBILITY
+    mgtDataName:
+      type: string
     NodeFilter:
       type: object
       properties:
@@ -74,7 +80,10 @@ components:
                 managementData:
                   $ref: '#/components/schemas/ManagementData'
                 targetNodeFilter:
-                  $ref: '#/components/schemas/NodeFilter'
+                  type: array
+                  items:
+                    $ref: '#/components/schemas/NodeFilter'
+                  uniqueItems: true  
                 collectionTimeWindow:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
                 reportingCtrl:
@@ -93,7 +102,12 @@ components:
                   type: boolean
                 jobId:
                   type: string
-
+          required:
+            - managementData
+            - targetNodeFilter
+            - collectionTimeWindow
+            - reportingCtrl
+            - jobId
 #-------- Definition of YAML arrays for name-contained IOCs ----------------------
     ManagementDataCollection-Multiple:
       type: array