diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 0fd5c1cfe94752ba623cd16efa339d388ca78061..1b9d0a6c293f023e052db62ca0908045d850516e 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -1436,6 +1436,34 @@ components:
             $ref: '#/components/schemas/TaiRange'
           minItems: 1
 
+    ChfInfo:
+      description: Information of a CHF NF Instance
+      type: object
+      not:
+        required: [ primaryChfInstance, secondaryChfInstance ]
+      properties:
+        supiRangeList:
+          type: array
+          items:
+            $ref: '#/components/schemas/SupiRange'
+          minItems: 0
+        gpsiRangeList:
+          type: array
+          items:
+            $ref: '#/components/schemas/IdentityRange'
+          minItems: 0
+        plmnRangeList:
+          type: array
+          items:
+            $ref: '#/components/schemas/PlmnRange'
+          minItems: 0
+        groupId:
+          $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId'
+        primaryChfInstance:
+          $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId'
+        secondaryChfInstance:
+          $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId'
+
 #-------- Definition of concrete IOCs --------------------------------------------
     ProvMnS:
       oneOf:
@@ -1541,6 +1569,8 @@ components:
               $ref: '#/components/schemas/AfFunction-Multiple'
             DCCFFunction:
               $ref: '#/components/schemas/DccfFunction-Multiple'
+            ChfFunction:
+              $ref: '#/components/schemas/ChfFunction-Multiple'
 
     AmfFunction-Single:
       allOf:
@@ -1616,7 +1646,11 @@ components:
             EP_NLG:
               $ref: '#/components/schemas/EP_NLG-Multiple'
             EP_N58:
-              $ref: '#/components/schemas/EP_N13-Multiple'
+              $ref: '#/components/schemas/EP_N58-Multiple'
+            EP_N41:
+              $ref: '#/components/schemas/EP_N41-Multiple'
+            EP_N42:
+              $ref: '#/components/schemas/EP_N42-Multiple'
     AmfSet-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1727,6 +1761,8 @@ components:
               $ref: '#/components/schemas/EP_N16-Multiple'
             EP_S5C:
               $ref: '#/components/schemas/EP_S5C-Multiple'
+            EP_N40:
+              $ref: '#/components/schemas/EP_N40-Multiple'
             FiveQiDscpMappingSet:
               $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
             GtpUPathQoSMonitoringControl:
@@ -1889,6 +1925,8 @@ components:
               $ref: '#/components/schemas/EP_N15-Multiple'
             EP_N16:
               $ref: '#/components/schemas/EP_N16-Multiple'
+            EP_N28:
+              $ref: '#/components/schemas/EP_N28-Multiple'
             EP_Rx:
               $ref: '#/components/schemas/EP_Rx-Multiple'
             PredefinedPccRuleSet:
@@ -3201,6 +3239,95 @@ components:
                       $ref: '#/components/schemas/DccfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
 
+    ChfFunction-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'
+                    chfInfo:
+                      $ref: '#/components/schemas/ChfInfo'
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - type: object
+          properties:
+            EP_N28:
+              $ref: '#/components/schemas/EP_N28-Multiple'
+            EP_N40:
+              $ref: '#/components/schemas/EP_N40-Multiple'
+            EP_N41:
+              $ref: '#/components/schemas/EP_N41-Multiple'
+            EP_N42:
+              $ref: '#/components/schemas/EP_N42-Multiple'
+
+    EP_N28-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              allOf:
+                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - type: object
+                  properties:
+                    localAddress:
+                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
+                    remoteAddress:
+                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
+    EP_N40-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              allOf:
+                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - type: object
+                  properties:
+                    localAddress:
+                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
+                    remoteAddress:
+                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
+    EP_N41-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              allOf:
+                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - type: object
+                  properties:
+                    localAddress:
+                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
+                    remoteAddress:
+                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
+    EP_N42-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              allOf:
+                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - type: object
+                  properties:
+                    localAddress:
+                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
+                    remoteAddress:
+                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
+
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
 
     SubNetwork-Multiple:
@@ -3406,6 +3533,10 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/EP_N27-Single'
+    EP_N28-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EP_N28-Single'
 
     EP_N31-Multiple:
       type: array
@@ -3419,6 +3550,19 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/EP_N33-Single'
+    EP_N40-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EP_N40-Single'
+    EP_N41-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EP_N41-Single'
+    EP_N42-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EP_N42-Single'
+
     EP_S5C-Multiple:
       type: array
       items:
@@ -3499,6 +3643,10 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/DccfFunction-Single'
+    ChfFunction-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/ChfFunction-Single'
 
 #------------ Definitions in TS 28.541 for TS 28.532 -----------------------------
 
@@ -3561,10 +3709,15 @@ components:
 
        - $ref: '#/components/schemas/EP_N26-Single'
        - $ref: '#/components/schemas/EP_N27-Single'
+       - $ref: '#/components/schemas/EP_N28-Single'
 
        - $ref: '#/components/schemas/EP_N31-Single'
        - $ref: '#/components/schemas/EP_N32-Single'
-       - $ref: '#/components/schemas/EP_N33-Single'       
+       - $ref: '#/components/schemas/EP_N33-Single'
+       - $ref: '#/components/schemas/EP_N40-Single'
+       - $ref: '#/components/schemas/EP_N41-Single'
+       - $ref: '#/components/schemas/EP_N42-Single'
+       
        - $ref: '#/components/schemas/EP_N58-Single'
        - $ref: '#/components/schemas/EP_N59-Single'              
        - $ref: '#/components/schemas/EP_N60-Single'
@@ -3590,3 +3743,5 @@ components:
        - $ref: '#/components/schemas/NssaafFunction-Single'
        - $ref: '#/components/schemas/AfFunction-Single'
        - $ref: '#/components/schemas/DccfFunction-Single'
+       - $ref: '#/components/schemas/ChfFunction-Single'
+       - $ref: '#/components/schemas/ChfFunction-Single'