diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml
index 7d4cb0b6131718a685d5189c1974f3d1a2470013..e9689be367501ce932286b479f957cfb94bd7e14 100755
--- a/OpenAPI/TS28623_ComDefs.yaml
+++ b/OpenAPI/TS28623_ComDefs.yaml
@@ -100,6 +100,11 @@ components:
     Nid:
       type: string
       pattern: '^[A-Fa-f0-9]{11}$'
+
+    CagId:
+      type: string
+      pattern: '^[A-Fa-f0-9]{8}$'
+
     PlmnId:
       description: This datatype is used for writable attribute
       type: object
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 8d054aa95d0127c4c046bb1710e3a68b2d9c3369..0b5f6012856981c47613cdab8454a70b6a8f78c0 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -154,29 +154,55 @@ components:
       allOf:
       - type: array
         items:
-          $ref: '#/components/schemas/NpnId-Type'
-        minItems: 1
+          $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'
+        maxItems: 16384
       - 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:
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/CagId'
+              maxItems: 256
+        - type: object
+          properties: 
+            taList:
+              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/NrCellId'
-          minItems: 1
-          maxItems: 32
-        - type: array
-          items:
-            $ref: '#/components/schemas/Tac'
-          minItems: 1
-          maxItems: 8
-        - type: array
-          items:
-            $ref: '#/components/schemas/Tai'
+            $ref: '#/components/schemas/NpnId-Type'
           minItems: 1
-          maxItems: 8
     Tai:
       type: object
       properties:
@@ -255,7 +281,7 @@ components:
           type: array
           uniqueItems: true
           items:
-            type: string
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/CagId'
           maxItems: 256  
         nIDList:
           type: array