diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 25404c6f892167a1c35074a14e29b38c2a098a41..0fcaad7c31a8202b8eb290205e30bc4aae240590 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -1494,18 +1494,38 @@ components:
         secondaryChfInstance:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId'
 
+    N2InterfaceAmfInfo:
+      description: AMF N2 interface information
+      type: object
+      anyOf:
+        - required: [ ipv4EndpointAddress ]
+        - required: [ ipv6EndpointAddress ]
+      properties:
+        ipv4EndpointAddress:
+          type: array
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
+          minItems: 1
+        ipv6EndpointAddress:
+          type: array
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
+          minItems: 1
+        amfName:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
+
     AmfInfo:
       description: Information of an AMF NF Instance
       type: object
-      # required:
-        # - amfSetId
-        # - amfRegionId
-        # - guamiList
+      required:
+        - amfSetId
+        - amfRegionId
+        - guamiList
       properties:
-        # amfSetId:
-          # $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfSetId'
-        # amfRegionId:
-          # $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfRegionId'
+        amfSetId:
+          $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfSetId'
+        amfRegionId:
+          $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfRegionId'
         guamiList:
           type: array
           items:
@@ -1531,13 +1551,13 @@ components:
           items:
             $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami'
           minItems: 1
-        # n2InterfaceAmfInfo:
-          # $ref: '#/components/schemas/N2InterfaceAmfInfo'
-        # amfOnboardingCapability:
-          # type: boolean
-          # default: false
-        # highLatencyCom:
-          # type: boolean
+        n2InterfaceAmfInfo:
+          $ref: '#/components/schemas/N2InterfaceAmfInfo'
+        amfOnboardingCapability:
+          type: boolean
+          default: false
+        highLatencyCom:
+          type: boolean
 
     SmfInfo:
       description: Information of an SMF NF Instance
@@ -1583,15 +1603,15 @@ components:
           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
+        smfOnboardingCapability:
+          type: boolean
+          default: false
+          deprecated: true
+        ismfSupportInd:
+          type: boolean
+        smfUPRPCapability:
+          type: boolean
+          default: false
 
     UpfInfo:
       description: Information of an UPF NF Instance
@@ -2010,26 +2030,26 @@ components:
                 - $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
+        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
@@ -2088,14 +2108,14 @@ components:
                 # - $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
+        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