diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 370f6f68c50a4f3bb10293733a261adccaa7cf33..ff834f78aca534f7262ce223c9ec472ab5609f77 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -66,13 +66,24 @@ components:
       type: string
     NpnIdentity:
       type: object
+      oneOf:
+        - required: [ plmnId, cagidList ]
+        - required: [ plmnId, nidList ]       
       properties:
         plmnId:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         cagidList:
-          $ref: '#/components/schemas/cagId'
+          type: array
+          items:
+            $ref: '#/components/schemas/cagId'
+          minItems: 1
+          maxItems: 12  
         nidList:
-          $ref: '#/components/schemas/nid'
+          type: array
+          items:
+            $ref: '#/components/schemas/nid'
+          minItems: 1
+          maxItems: 12              
     NpnIdentityList:
       type: array
       items: