diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index c0e76d70c2c28c4d87a2310390d9bf972c7f4dbe..4d1bd40fbcdf19bf4f234233f33bbc84de865f1f 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -233,24 +233,55 @@ components:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
         timer:
           type: integer
+    
     AreaScope:
-      allOf:
+      oneOf:
+      - type: array
+        items:
+          $ref: '#/components/schemas/EutraCellId'
+        minItems: 1
+        maxItems: 32
+      - type: object
+        properties: 
+          nrCellId:
+            type: array
+            items:
+              $ref: '#/components/schemas/NrCellId'
+            minItems: 1
+            maxItems: 32
+          nPNIdentityList:
+            type: array
+            items:
+              $ref: '#/components/schemas/NpnId-Type'
+      - type: object
+        properties: 
+          tacList:
+            type: array
+            items:
+              $ref: '#/components/schemas/Tac'
+            minItems: 1
+            maxItems: 8
+          cAGIdList:
+            type: array
+            items:
+              type: string
+            maxItems: 256
+      - type: object
+        properties: 
+          taiList:
+            type: array
+            items:
+              $ref: '#/components/schemas/Tai'
+            minItems: 1
+            maxItems: 8
+          nPNIdentityList:
+            type: array
+            items:
+              $ref: '#/components/schemas/NpnId-Type'
       - 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'
+        minItems: 1
     Tai:
       type: object
       properties: