diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 6a93d8d7269c14d3f2a595ea2f005efd085df506..da5bef8f4c89ea4e1cdd87b48b1cded567f2bf42 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -64,35 +64,11 @@ components:
     PlmnInfoList:
       type: array
       items:
-        $ref: '#/components/schemas/PlmnInfo'
-    cagId:
-      type: string
-    nid:
-      type: string
-    NpnIdentity:
-      type: object
-      oneOf:
-        - required: [ plmnId, cagidList ]
-        - required: [ plmnId, nidList ]       
-      properties:
-        plmnId:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
-        cagidList:
-          type: array
-          items:
-            $ref: '#/components/schemas/cagId'
-          minItems: 1
-          maxItems: 12  
-        nidList:
-          type: array
-          items:
-            $ref: '#/components/schemas/nid'
-          minItems: 1
-          maxItems: 12              
+        $ref: '#/components/schemas/PlmnInfo'            
     NpnIdentityList:
       type: array
       items:
-        $ref: '#/components/schemas/NpnIdentity'
+        $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type'
     GGnbId:
         type: string
         pattern: '^[0-9]{3}[0-9]{2,3}-(22|23|24|25|26|27|28|29|30|31|32)-[0-9]{1,10}'