diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 70629230357a9f925efa5b1cfdee8aa8257a8127..cc50d2289596c7199743bca7558dce5e5425b046 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -3811,6 +3811,8 @@ components:
               $ref: '#/components/schemas/EP_N89-Multiple'
             EP_N11mb:
               $ref: '#/components/schemas/EP_N11mb-Multiple'
+            EP_AIOT3:
+              $ref: '#/components/schemas/EP_AIOT3-Multiple'
     AmfSet-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -4129,7 +4131,11 @@ components:
                     udrInfo:
                       $ref: '#/components/schemas/UdrInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
-        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'
+        - type: object
+          properties:
+            EP_AIOT7:
+              $ref: '#/components/schemas/EP_AIOT7-Multiple'                   
     UdsfFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -4182,6 +4188,8 @@ components:
               $ref: '#/components/schemas/EP_N96-Multiple'
             EP_SM14:
               $ref: '#/components/schemas/EP_SM14-Multiple'
+            EP_AIOT5:
+              $ref: '#/components/schemas/EP_AIOT5-Multiple'
     NssfFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -4438,6 +4446,10 @@ components:
               $ref: '#/components/schemas/EP_N62-Multiple'
             EP_N63:
               $ref: '#/components/schemas/EP_N63-Multiple'
+            EP_AIOT4:
+              $ref: '#/components/schemas/EP_AIOT4-Multiple'
+            EP_AIOT8:
+              $ref: '#/components/schemas/EP_AIOT8-Multiple'
 
     NsacfFunction-Single:
       allOf:
@@ -4634,7 +4646,19 @@ components:
               allOf:
                 - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
-        - $ref: '#/components/schemas/ManagedFunction5GC-nc0' 
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'       
+        - type: object
+          properties:
+            EP_AIOT2:
+              $ref: '#/components/schemas/EP_AIOT2-Multiple'
+            EP_AIOT3:
+              $ref: '#/components/schemas/EP_AIOT3-Multiple'
+            EP_AIOT4:
+              $ref: '#/components/schemas/EP_AIOT4-Multiple'
+            EP_AIOT5:
+              $ref: '#/components/schemas/EP_AIOT5-Multiple'
+            EP_AIOT6:
+              $ref: '#/components/schemas/EP_AIOT6-Multiple'
 
     AdmFunction-Single:
       allOf:
@@ -4646,6 +4670,14 @@ components:
                 - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - $ref: '#/components/schemas/ManagedFunction5GC-nc0' 
+        - type: object
+          properties:
+            EP_AIOT6:
+              $ref: '#/components/schemas/EP_AIOT6-Multiple'
+            EP_AIOT7:
+              $ref: '#/components/schemas/EP_AIOT7-Multiple'
+            EP_AIOT8:
+              $ref: '#/components/schemas/EP_AIOT8-Multiple'
    
     EP_N2-Single:
       allOf:
@@ -5279,7 +5311,112 @@ components:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                     remoteAddress:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
-                      
+    
+    EP_AIOT2-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_AIOT3-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_AIOT4-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_AIOT5-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_AIOT6-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_AIOT7-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_AIOT8-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'
+
     FiveQiDscpMappingSet-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -6614,6 +6751,34 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/EP_SM14-Single'
+    EP_AIOT2-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EP_AIOT2-Single'
+    EP_AIOT3-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EP_AIOT3-Single'
+    EP_AIOT4-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EP_AIOT4-Single'
+    EP_AIOT5-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EP_AIOT5-Single'
+    EP_AIOT6-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EP_AIOT6-Single'
+    EP_AIOT7-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EP_AIOT7-Single'
+    EP_AIOT8-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EP_AIOT8-Single'
     Configurable5QISet-Multiple:
       type: array
       items:
@@ -6799,6 +6964,14 @@ components:
        - $ref: '#/components/schemas/EP_SM12-Single'
        - $ref: '#/components/schemas/EP_SM13-Single'
        - $ref: '#/components/schemas/EP_SM14-Single'
+       
+       - $ref: '#/components/schemas/EP_AIOT2-Single'
+       - $ref: '#/components/schemas/EP_AIOT3-Single'
+       - $ref: '#/components/schemas/EP_AIOT4-Single'
+       - $ref: '#/components/schemas/EP_AIOT5-Single'
+       - $ref: '#/components/schemas/EP_AIOT6-Single'
+       - $ref: '#/components/schemas/EP_AIOT7-Single'
+       - $ref: '#/components/schemas/EP_AIOT8-Single'
 
        - $ref: '#/components/schemas/Configurable5QISet-Single'
        - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'