diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 964235083eedf20617ed665573d86047d757f09a..c5aca7e8287ceff54495cba8038f15d2f81fb1c7 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -594,7 +594,7 @@ components:
           items:
             type: string
     
-    SNssaiSmfInfoItem:
+    SnssaiSmfInfoItem:
       type: object
       properties:
         sNSSAI:
@@ -1494,6 +1494,264 @@ components:
         secondaryChfInstance:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId'
 
+    AmfInfo:
+      description: Information of an AMF NF Instance
+      type: object
+      # required:
+        # - amfSetId
+        # - amfRegionId
+        # - guamiList
+      properties:
+        # amfSetId:
+          # $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfSetId'
+        # amfRegionId:
+          # $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfRegionId'
+        guamiList:
+          type: array
+          items:
+            $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami'
+          minItems: 1
+        taiList:
+          type: array
+          items:
+            $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai'
+          minItems: 1
+        taiRangeList:
+          type: array
+          items:
+            $ref: '#/components/schemas/TaiRange'
+          minItems: 1
+        backupInfoAmfFailure:
+          type: array
+          items:
+            $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami'
+          minItems: 1
+        backupInfoAmfRemoval:
+          type: array
+          items:
+            $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami'
+          minItems: 1
+        # n2InterfaceAmfInfo:
+          # $ref: '#/components/schemas/N2InterfaceAmfInfo'
+        # amfOnboardingCapability:
+          # type: boolean
+          # default: false
+        # highLatencyCom:
+          # type: boolean
+
+    SmfInfo:
+      description: Information of an SMF NF Instance
+      type: object
+      required:
+        - sNssaiSmfInfoList
+      properties:
+        sNssaiSmfInfoList:
+          type: array
+          items:
+            $ref: '#/components/schemas/SnssaiSmfInfoItem'
+          minItems: 1
+        taiList:
+          type: array
+          items:
+            $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai'
+          minItems: 1
+        taiRangeList:
+          type: array
+          items:
+            $ref: '#/components/schemas/TaiRange'
+          minItems: 1
+        pgwFqdn:
+          $ref: 'TS29571_CommonData.yaml#/components/schemas/Fqdn'
+        pgwIpAddrList:
+          type: array
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr'
+          minItems: 1
+        accessType:
+          type: array
+          items:
+            $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType'
+          minItems: 1
+        priority:
+          type: integer
+          minimum: 0
+          maximum: 65535
+        vsmfSupportInd:
+          type: boolean
+        pgwFqdnList:
+          type: array
+          items:
+            $ref: 'TS29571_CommonData.yaml#/components/schemas/Fqdn'
+          minItems: 1
+        # smfOnboardingCapability:
+          # type: boolean
+          # default: false
+          # deprecated: true
+        # ismfSupportInd:
+          # type: boolean
+        # smfUPRPCapability:
+          # type: boolean
+          # default: false
+
+    UpfInfo:
+      description: Information of an UPF NF Instance
+      type: object
+      # required:
+        # - sNssaiUpfInfoList
+      properties:
+        # sNssaiUpfInfoList:
+          # type: array
+          # items:
+            # $ref: '#/components/schemas/SnssaiUpfInfoItem'
+          # minItems: 1
+        smfServingArea:
+          type: array
+          items:
+            type: string
+          minItems: 1
+        interfaceUpfInfoList:
+          type: array
+          items:
+            $ref: '#/components/schemas/InterfaceUpfInfoItem'
+          minItems: 1
+        iwkEpsInd:
+          type: boolean
+          default: false
+        # sxaInd:
+          # type: boolean
+        pduSessionTypes:
+          type: array
+          items:
+            $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType'
+          minItems: 1
+        atsssCapability:
+          $ref: 'TS29571_CommonData.yaml#/components/schemas/AtsssCapability'
+        ueIpAddrInd:
+          type: boolean
+          default: false
+        taiList:
+          type: array
+          items:
+            $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai'
+          minItems: 1
+        taiRangeList:
+          type: array
+          items:
+            $ref: '#/components/schemas/TaiRange'
+          minItems: 1
+        wAgfInfo:
+          # $ref: '#/components/schemas/WAgfInfo'
+          $ref: '#/components/schemas/IpInterface'
+        tngfInfo:
+          # $ref: '#/components/schemas/TngfInfo'
+          $ref: '#/components/schemas/IpInterface'
+        twifInfo:
+          # $ref: '#/components/schemas/TwifInfo'
+          $ref: '#/components/schemas/IpInterface'
+        priority:
+          type: integer
+          minimum: 0
+          maximum: 65535
+        redundantGtpu:
+          type: boolean
+          default: false
+        ipups:
+          type: boolean
+          default: false
+        dataForwarding:
+          type: boolean
+          default: false
+        supportedPfcpFeatures:
+          type: string
+        # upfEvents:
+          # type: array
+          # items:
+            # $ref: 'TS29564_Nupf_EventExposure.yaml#/components/schemas/EventType'
+          # minItems: 1
+
+    PcfInfo:
+      description: Information of a PCF NF Instance
+      type: object
+      properties:
+        groupId:
+          $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId'
+        dnnList:
+          type: array
+          items:
+            $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn'
+          minItems: 1
+        supiRanges:
+          type: array
+          items:
+            $ref: '#/components/schemas/SupiRange'
+          minItems: 1
+        gpsiRanges:
+          type: array
+          items:
+            $ref: '#/components/schemas/IdentityRange'
+          minItems: 1
+        rxDiamHost:
+          $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity'
+        rxDiamRealm:
+          $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity'
+        v2xSupportInd:
+          type: boolean
+          default: false
+        proseSupportInd:
+          type: boolean
+          default: false
+        proseCapability:
+          $ref: '#/components/schemas/ProseCapability'
+        v2xCapability:
+          $ref: '#/components/schemas/V2xCapability'
+
+    NefInfo:
+      description: Information of an NEF NF Instance
+      type: object
+      properties:
+        nefId:
+          # $ref: '#/components/schemas/NefId'
+          type: string
+        pfdData:
+          $ref: '#/components/schemas/PfdData'
+        afEeData:
+          $ref: '#/components/schemas/AfEventExposureData'
+        gpsiRanges:
+          type: array
+          items:
+            $ref: '#/components/schemas/IdentityRange'
+          minItems: 1
+        externalGroupIdentifiersRanges:
+          type: array
+          items:
+            $ref: '#/components/schemas/IdentityRange'
+          minItems: 1
+        servedFqdnList:
+          type: array
+          items:
+            type: string
+          minItems: 1
+        taiList:
+          $ref: '#/components/schemas/TaiList'
+        taiRangeList:
+          type: array
+          items:
+            $ref: '#/components/schemas/TaiRange'
+          minItems: 1
+        dnaiList:
+          type: array
+          items:
+            $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai'
+          minItems: 1
+        unTrustAfInfoList:
+          type: array
+          items:
+            $ref: '#/components/schemas/UnTrustAfInfo'
+          minItems: 1
+        uasNfFunctionalityInd:
+          type: boolean
+          default: false
+
     NrfInfo:
       description: Information of an NRF NF Instance, used in hierarchical NRF deployments
       type: object
@@ -1506,6 +1764,18 @@ components:
               - $ref: '#/components/schemas/UdrInfo'
               - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
           minProperties: 1
+        servedUdrInfoList:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            description: A map (list of key-value pairs) where a valid JSON string serves as key
+            type: object
+            additionalProperties:
+              anyOf:
+                - $ref: '#/components/schemas/UdrInfo'
+                - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+            minProperties: 1
+          minProperties: 1
         servedUdmInfo:
           description: A map (list of key-value pairs) where nfInstanceId serves as key
           type: object
@@ -1514,6 +1784,18 @@ components:
               - $ref: '#/components/schemas/UdmInfo'
               - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
           minProperties: 1
+        servedUdmInfoList:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            description: A map (list of key-value pairs) where a valid JSON string serves as key
+            type: object
+            additionalProperties:
+              anyOf:
+                - $ref: '#/components/schemas/UdmInfo'
+                - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+            minProperties: 1
+          minProperties: 1
         servedAusfInfo:
           description: A map (list of key-value pairs) where nfInstanceId serves as key
           type: object
@@ -1522,6 +1804,146 @@ components:
               - $ref: '#/components/schemas/AusfInfo'
               - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
           minProperties: 1
+        servedAusfInfoList:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            description: A map (list of key-value pairs) where a valid JSON string serves as key
+            type: object
+            additionalProperties:
+              anyOf:
+                - $ref: '#/components/schemas/AusfInfo'
+                - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+            minProperties: 1
+          minProperties: 1
+        servedAmfInfo:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            anyOf:
+              - $ref: '#/components/schemas/AmfInfo'
+              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+          minProperties: 1
+        servedAmfInfoList:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            description: A map (list of key-value pairs) where a valid JSON string serves as key
+            type: object
+            additionalProperties:
+              anyOf:
+                - $ref: '#/components/schemas/AmfInfo'
+                - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+            minProperties: 1
+          minProperties: 1
+        servedSmfInfo:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            anyOf:
+              - $ref: '#/components/schemas/SmfInfo'
+              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+          minProperties: 1
+        servedSmfInfoList:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            description: A map (list of key-value pairs) where a valid JSON string serves as key
+            type: object
+            additionalProperties:
+              anyOf:
+                - $ref: '#/components/schemas/SmfInfo'
+                - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+            minProperties: 1
+          minProperties: 1
+        servedUpfInfo:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            anyOf:
+              - $ref: '#/components/schemas/UpfInfo'
+              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+          minProperties: 1
+        servedUpfInfoList:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            description: A map (list of key-value pairs) where a valid JSON string serves as key
+            type: object
+            additionalProperties:
+              anyOf:
+                - $ref: '#/components/schemas/UpfInfo'
+                - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+            minProperties: 1
+          minProperties: 1
+        servedPcfInfo:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            anyOf:
+              - $ref: '#/components/schemas/PcfInfo'
+              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+          minProperties: 1
+        servedPcfInfoList:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            description: A map (list of key-value pairs) where a valid JSON string serves as key
+            type: object
+            additionalProperties:
+              anyOf:
+                - $ref: '#/components/schemas/PcfInfo'
+                - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+            minProperties: 1
+          minProperties: 1
+        # servedBsfInfo:
+          # description: A map (list of key-value pairs) where nfInstanceId serves as key
+          # type: object
+          # additionalProperties:
+            # anyOf:
+              # - $ref: '#/components/schemas/BsfInfo'
+              # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+          # minProperties: 1
+        # servedBsfInfoList:
+          # description: A map (list of key-value pairs) where nfInstanceId serves as key
+          # type: object
+          # additionalProperties:
+            # description: A map (list of key-value pairs) where a valid JSON string serves as key
+            # type: object
+            # additionalProperties:
+              # anyOf:
+                # - $ref: '#/components/schemas/BsfInfo'
+                # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+            # minProperties: 1
+          # minProperties: 1
+        servedChfInfo:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            anyOf:
+              - $ref: '#/components/schemas/ChfInfo'
+              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+          minProperties: 1
+        servedChfInfoList:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            description: A map (list of key-value pairs) where a valid JSON string serves as key
+            type: object
+            additionalProperties:
+              anyOf:
+                - $ref: '#/components/schemas/ChfInfo'
+                - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+            minProperties: 1
+          minProperties: 1
+        servedNefInfo:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            anyOf:
+              - $ref: '#/components/schemas/NefInfo'
+              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+          minProperties: 1
         servedNwdafInfo:
           description: A map (list of key-value pairs) where nfInstanceId serves as key
           type: object
@@ -1530,6 +1952,36 @@ components:
               - $ref: '#/components/schemas/NwdafInfo'
               - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
           minProperties: 1
+        servedNwdafInfoList:
+          type: object
+          description: A map (list of key-value pairs) where NF Instance Id serves as key
+          additionalProperties:
+            type: object
+            description: A map (list of key-value pairs) where a valid JSON string serves as key
+            additionalProperties:
+              $ref: '#/components/schemas/NwdafInfo'
+            minProperties: 1
+          minProperties: 1
+        # servedPcscfInfoList:
+          # description: A map (list of key-value pairs) where nfInstanceId serves as key
+          # type: object
+          # additionalProperties:
+            # description: A map (list of key-value pairs) where a valid JSON string serves as key
+            # type: object
+            # additionalProperties:
+              # anyOf:
+                # - $ref: '#/components/schemas/PcscfInfo'
+                # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+            # minProperties: 1
+          # minProperties: 1
+        # servedGmlcInfo:
+          # description: A map (list of key-value pairs) where nfInstanceId serves as key
+          # type: object
+          # additionalProperties:
+            # anyOf:
+              # - $ref: '#/components/schemas/GmlcInfo'
+              # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+          # minProperties: 1
         servedLmfInfo:
           description: A map (list of key-value pairs) where nfInstanceId serves as key
           type: object
@@ -1538,6 +1990,24 @@ components:
               - $ref: '#/components/schemas/LmfInfo'
               - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
           minProperties: 1
+        # servedNfInfo:
+          # description: A map (list of key-value pairs) where nfInstanceId serves as key
+          # type: object
+          # additionalProperties:
+            # $ref: '#/components/schemas/NfInfo'
+          # minProperties: 1
+        # servedHssInfoList:
+          # description: A map (list of key-value pairs) where nfInstanceId serves as key
+          # type: object
+          # additionalProperties:
+            # description: A map (list of key-value pairs) where a valid JSON string serves as key
+            # type: object
+            # additionalProperties:
+              # anyOf:
+                # - $ref: '#/components/schemas/HssInfo'
+                # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+            # minProperties: 1
+          # minProperties: 1
         servedUdsfInfo:
           description: A map (list of key-value pairs) where nfInstanceId serves as key
           type: object
@@ -1546,6 +2016,34 @@ components:
               - $ref: '#/components/schemas/UdsfInfo'
               - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
           minProperties: 1
+        servedUdsfInfoList:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            description: A map (list of key-value pairs) where a valid JSON string serves as key
+            type: object
+            additionalProperties:
+              anyOf:
+                - $ref: '#/components/schemas/UdsfInfo'
+                - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+            minProperties: 1
+          minProperties: 1
+        servedScpInfoList:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            anyOf:
+              - $ref: '#/components/schemas/ScpInfo'
+              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+          minProperties: 1
+        servedSeppInfoList:
+          description: A map (list of key-value pairs) where nfInstanceId serves as key
+          type: object
+          additionalProperties:
+            anyOf:
+              - $ref: '#/components/schemas/SeppInfo'
+              - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
+          minProperties: 1
         servedTrustAfInfo:
           type: object
           description: A map (list of key-value pairs) where NF Instance Id serves as key
@@ -1810,34 +2308,18 @@ components:
                       type: string
                     interPlmnFQDN:
                       type: string
-                    taiList:
-                      $ref: '#/components/schemas/TaiList'
-                    taiRangeList:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/TaiRange'
                     weightFactor:
                       $ref: '#/components/schemas/WeightFactor'
                     cNSIIdList:
                       $ref: '#/components/schemas/CNSIIdList'
-                    gUAMIdList:
-                      type: array
-                      items: 
-                        $ref: '#/components/schemas/GUAMInfo'
-                    backupInfoAmfFailure:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/GUAMInfo'
-                    backupInfoAmfRemoval:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/GUAMInfo'
                     amfSetRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     managedNFProfile:
                       $ref: '#/components/schemas/ManagedNFProfile'
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
+                    amfInfo:
+                      $ref: '#/components/schemas/AmfInfo'  
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -1931,43 +2413,18 @@ components:
                       $ref: '#/components/schemas/TACList'
                     sBIFqdn:
                       type: string
-                    sNssaiSmfInfoList:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/SNssaiSmfInfoItem'
-                    taiList:
-                      $ref: '#/components/schemas/TaiList'
-                    taiRangeList:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/TaiRange'
-                    pwgFqdn:
-                      type: string
-                    pgwAddrList:
-                      type: array
-                      items:
-                        $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr'
-                    accessType:
-                      $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType'
-                    priority:
-                      type: integer
                     cNSIIdList:
                       $ref: '#/components/schemas/CNSIIdList'
-                    vsmfSupportInd:
-                      type: boolean
-                    pwgFqdnList:    
-                      type: array
-                      items: 
-                        type: string
                     managedNFProfile:
                       $ref: '#/components/schemas/ManagedNFProfile'
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
+                    SmfInfo:
+                      $ref: '#/components/schemas/SmfInfo'  
                     configurable5QISetRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -2012,52 +2469,12 @@ components:
                       $ref: '#/components/schemas/TACList'
                     cNSIIdList:
                       $ref: '#/components/schemas/CNSIIdList'
-                    smfServingArea:
-                       type: string
-                    interfaceUpfInfoList:
-                       type: array
-                       items:
-                         $ref: '#/components/schemas/InterfaceUpfInfoItem'
-                    iwkEpsInd:
-                       type: boolean
-                    pduSessionTypes:
-                      type: string
-                      enum:
-                        - IPV4
-                        - IPV6
-                        - IPV4V6
-                        - UNSTRUCTURED
-                        - ETHERNET
-                    atsssCapability:
-                       $ref: '#/components/schemas/AtsssCapability'
-                    ueIpAddrInd:
-                       type: boolean
-                    taiList:
-                      $ref: '#/components/schemas/TaiList'
-                    taiRangeList:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/TaiRange'
-                    wAgfInfo:
-                      $ref: '#/components/schemas/IpInterface'
-                    tngfInfo:
-                      $ref: '#/components/schemas/IpInterface'
-                    twifInfo:
-                      $ref: '#/components/schemas/IpInterface'
-                    priority:
-                      type: integer
-                    redundantGtpu:
-                      type: boolean
-                    ipups:
-                      type: boolean
-                    dataForwarding:
-                      type: boolean
-                    supportedPfcpFeatures:
-                      type: string
                     managedNFProfile:
                       $ref: '#/components/schemas/ManagedNFProfile'
                     supportedBMOList:
                       $ref: '#/components/schemas/SupportedBMOList'
+                    upfInfo:
+                      $ref: '#/components/schemas/UpfInfo'        
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -2110,34 +2527,14 @@ components:
                       $ref: '#/components/schemas/ManagedNFProfile'
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
-                    groupId:
-                      type: string
-                    dnnList:
-                      type: array
-                      items:
-                        type: string
-                    supiRanges:
-                      $ref: '#/components/schemas/SupiRangeList'
-                    gpsiRanges:
-                      $ref: '#/components/schemas/IdentityRangeList'
-                    rxDiamHost:
-                      type: string
-                    rxDiamRealm:
-                      type: string
-                    v2xSupportInd:
-                      type: boolean
-                    proseSupportInd:
-                      type: boolean
-                    proseCapability:
-                      $ref: '#/components/schemas/ProseCapability'
-                    v2xCapability:
-                      $ref: '#/components/schemas/V2xCapability'
+                    supportedBMOList:
+                      $ref: '#/components/schemas/SupportedBMOList'
+                    PcfInfo:
+                      $ref: '#/components/schemas/PcfInfo' 
                     configurable5QISetRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-                    supportedBMOList:
-                      $ref: '#/components/schemas/SupportedBMOList'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -2486,48 +2883,8 @@ components:
                       $ref: '#/components/schemas/CapabilityList'
                     isCAPIFSup:
                       type: boolean
-                    taiList:
-                      $ref: '#/components/schemas/TaiList'
-                    taiRangeList:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/TaiRange'
-                    dnai:
-                      type: string
-                    nefId:
-                      type: string
-                    pfdData:
-                      $ref: '#/components/schemas/PfdData'
-                    afEeData:
-                      $ref: '#/components/schemas/AfEventExposureData'
-                    gpsiRanges:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/IdentityRange'
-                      minItems: 1
-                    externalGroupIdentifiersRanges:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/IdentityRange'
-                      minItems: 1
-                    servedFqdnList:
-                      type: array
-                      items:
-                        type: string
-                      minItems: 1
-                    dnaiList:
-                      type: array
-                      items:
-                        $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai'
-                      minItems: 1
-                    unTrustAfInfoList:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/UnTrustAfInfo'
-                      minItems: 1
-                    uasNfFunctionalityInd:
-                      type: boolean
-                      default: false
+                    nefInfo:
+                       $ref: '#/components/schemas/NefInfo' 
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties: