diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 1b9d0a6c293f023e052db62ca0908045d850516e..329aabba2683370652b997fc73f54a72eba9b50f 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -1426,15 +1426,31 @@ components:
             $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId'
           minItems: 1
         taiList:
+          $ref: '#/components/schemas/TaiList'
+        taiRangeList:
           type: array
           items:
-            $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai'
+            $ref: '#/components/schemas/TaiRange'
           minItems: 1
+
+    MfafInfo:
+      description: Information of a MFAF NF Instance
+      type: object
+      properties:
+        servingNfTypeList:
+          type: array
+          items:
+            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
+        servingNfSetIdList:
+          type: array
+          items:
+            $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId'
+        taiList:
+          $ref: '#/components/schemas/TaiList'
         taiRangeList:
           type: array
           items:
             $ref: '#/components/schemas/TaiRange'
-          minItems: 1
 
     ChfInfo:
       description: Information of a CHF NF Instance
@@ -1571,6 +1587,8 @@ components:
               $ref: '#/components/schemas/DccfFunction-Multiple'
             ChfFunction:
               $ref: '#/components/schemas/ChfFunction-Multiple'
+            MFAFFunction:
+              $ref: '#/components/schemas/MfafFunction-Multiple'
 
     AmfFunction-Single:
       allOf:
@@ -3239,6 +3257,28 @@ components:
                       $ref: '#/components/schemas/DccfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
 
+    MfafFunction-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              allOf:
+                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - type: object
+                  properties:
+                    pLMNInfoList:
+                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'
+                    sBIFqdn:
+                      type: string
+                    managedNFProfile:
+                      $ref: '#/components/schemas/ManagedNFProfile'
+                    commModelList:
+                      $ref: '#/components/schemas/CommModelList'
+                    mfafInfo:
+                      $ref: '#/components/schemas/MfafInfo'
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+
     ChfFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3647,6 +3687,10 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/ChfFunction-Single'
+    MfafFunction-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/MfafFunction-Single'
 
 #------------ Definitions in TS 28.541 for TS 28.532 -----------------------------
 
@@ -3744,4 +3788,4 @@ components:
        - $ref: '#/components/schemas/AfFunction-Single'
        - $ref: '#/components/schemas/DccfFunction-Single'
        - $ref: '#/components/schemas/ChfFunction-Single'
-       - $ref: '#/components/schemas/ChfFunction-Single'
+       - $ref: '#/components/schemas/MfafFunction-Single'