diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 218c03a1401dd90c10d55c0281c4909f9849de4d..1c5ef945901f20c4201fa88719b9263545e9dc18 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -54,34 +54,7 @@ components:
       type: array
       description: List of NF profile
       items:
-        $ref: '#/components/schemas/NFProfile'
-    NFProfile:
-      type: object
-      description: 'NF profile stored in NRF, defined in TS 29.510'
-      properties:
-        nfInstanceId:
-          type: string
-          description: uuid of NF instance
-        nfType:
-          $ref: '#/components/schemas/NFType'
-        nfStatus:
-          $ref: '#/components/schemas/NFStatus'
-        plmn:
-          type: array
-          items:
-            $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
-        sNssais:
-          type: array
-          items:
-            $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
-        fqdn:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
-        interPlmnFqdn:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
-        nfServices:
-          type: array
-          items:
-            $ref: '#/components/schemas/NFService'
+        $ref: '#/components/schemas/ManagedNFProfile'
     NFService:
       type: object
       description: NF Service is defined in TS 29.510
@@ -318,6 +291,20 @@ components:
           readOnly: true
         nfType:
           $ref: '#/components/schemas/NFType'
+        nfStatus:
+          $ref: '#/components/schemas/NFStatus'
+        plmnList:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
+        sNssais:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
+        fqdn:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
         heartbeatTimer:
           type: integer
         authzInfo:
@@ -393,6 +380,11 @@ components:
           minItems: 1
         vendorId:
           $ref: '#/components/schemas/VendorId'
+        nfServices:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/NFService'
     SEPPType:
       type: string
       readOnly: true