diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 695a96fa442dded3b0438515c7de8c8ad024ef97..0c23c94f032c9c72104415cb35927471f7d393a3 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -201,23 +201,7 @@ components:
           properties:
             streamTarget:
               $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
-    Scope:
-      oneOf:
-        - type: object
-          properties:
-            scopeType:
-              type: string
-              enum:
-                - BASE_ONLY
-                - BASE_ALL
-                - BASE_NTH_LEVEL
-                - BASE_SUBTREE
-            scopeLevel:
-              type: integer
-        - type: object
-          properties:
-            dataNodeSelector:
-              type: string
+
     ProcessMonitor:
       description: >-
         This data type is the "ProcessMonitor" data type without specialisations.
diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
index 5d493262645fbb6458f8ab4ea7730cecd0226216..6d41737a912929a6449cb14169d5001d4b663a08 100644
--- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml
+++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
@@ -14,17 +14,22 @@ 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
+      oneOf:
+        - type: object
+          properties:
+            scopeType:
+              type: string
+              enum:
+                - BASE_ONLY
+                - BASE_ALL
+                - BASE_NTH_LEVEL
+                - BASE_SUBTREE
+            scopeLevel:
+              type: integer
+        - type: object
+          properties:
+            dataNodeSelector:
+              type: string
 
 #-------- Definition of concrete IOCs --------------------------------------------         
     NtfSubscriptionControl-Single: