diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml
index 83f86744da21584dabaed76065e4cf6c6a23b207..24ce1f3fc69519cc9a31524842c9838171dc4f21 100644
--- a/OpenAPI/TS28538_EdgeNrm.yaml
+++ b/OpenAPI/TS28538_EdgeNrm.yaml
@@ -169,6 +169,27 @@ components:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
         servedEESList:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+    SAP:
+      type: object
+      properties:
+        host:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr'
+        port:
+          type: integer
+    Operation:
+      type: object
+      properties:
+        name:
+          type: string
+        allowedConsumers:
+          type: string
+        operationSemantics:
+          type: string
+          description: any of enumrated value
+          enum:
+            - REQUEST_RESPONSE
+            - SUBSCRIBE_NOTIFY         
+
 #-------- Definition of types for name-containments ------
     SubNetwork-ncO-EdgeNrm:
       type: object
@@ -180,6 +201,30 @@ components:
         EASBundle:
           $ref: '#/components/schemas/EASBundle-Multiple'
 
+#-------- Definition of Edge common IOCs --------------------------------------------
+    ManagedEdgeNFService-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                userLabel:
+                  type: string
+                sAP:
+                  $ref: '#/components/schemas/SAP'
+                operations:
+                  type: array
+                  items:
+                    $ref: '#/components/schemas/Operation'
+                administrativeState:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
+                operationalState:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'
+#-------- Definition of Edge common IOCs --------------------------------------------
+
+
 #-------- Definition of concrete IOCs --------------------------------------------
 
     EdgeDataNetwork-Single:
@@ -287,6 +332,11 @@ components:
                     registrationInfo:
                       $ref: '#/components/schemas/RegistrationInfo'  
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - type: object
+          properties:
+            ManagedEdgeNFService:
+              $ref: '#/components/schemas/ManagedEdgeNFService-Multiple'
+
 
     ECSFunction-Single:
       allOf:
@@ -311,6 +361,10 @@ components:
                     sharedECSInfo:
                       $ref: '#/components/schemas/FederatedECSInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - type: object
+          properties:
+            ManagedEdgeNFService:
+              $ref: '#/components/schemas/ManagedEdgeNFService-Multiple'
 
     EASRequirements-Single:
       allOf:
@@ -460,6 +514,11 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/EASBundle-Single'
+    ManagedEdgeNFService-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/ManagedEdgeNFService-Single'
+
 #--------------------------------- Definition ------------------------------------                          
 
     resources-edgeNrm:
@@ -475,3 +534,4 @@ components:
         - $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single'
         - $ref: '#/components/schemas/EASResourceReservationJob-Single'
         - $ref: '#/components/schemas/EASBundle-Single'
+        - $ref: '#/components/schemas/ManagedEdgeNFService-Single'