diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 389d35d527c80f84764e6e0ff4225eaf3c239088..272fa9fd345ea883f76f89fa5b5bcb67c902c64c 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -101,23 +101,6 @@ 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 c91ffec5326ff3bda51513e7438f267085a54af1..8ab7afaeaeb44a3aa34b43e4f374f6429538a73c 100644
--- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml
+++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
@@ -27,17 +27,22 @@ components:
 
 #-------- 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: