diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index d9b96932b2f22c70903df42539d07783c3a93c15..e681c5c53657d20147c9f58805923f86d0c90894 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: