diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index bb5a2d861aacfc6d0c70a2a73335c49bc6588cd1..8d660d78b0bfad520c8169f5a40e2e823eb0c007 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -142,23 +142,23 @@ components:
         timer:
           type: integer
     AreaScope:
-      oneOf:
-      - type: array
-        items:
-          $ref: '#/components/schemas/EutraCellId'
-      - type: array
-        items:
-          $ref: '#/components/schemas/NrCellId'
-      - type: array
-        items:
-          $ref: '#/components/schemas/Tac'
-      - type: array
-        items:
-          $ref: '#/components/schemas/Tai'
+      allOf:
       - type: array
         items:
           $ref: '#/components/schemas/NpnId-Type'
-
+      - oneOf:
+        - type: array
+          items:
+            $ref: '#/components/schemas/EutraCellId'
+        - type: array
+          items:
+            $ref: '#/components/schemas/NrCellId'
+        - type: array
+          items:
+            $ref: '#/components/schemas/Tac'
+        - type: array
+          items:
+            $ref: '#/components/schemas/Tai'
     Tai:
       type: object
       properties: