diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml
index 81e314866f6754bcceb5a0d70228024d4033ab4d..665b551607848a508c1ddf4295fcaa9dfdf48fdc 100644
--- a/OpenAPI/EdgeNRM.yaml
+++ b/OpenAPI/EdgeNRM.yaml
@@ -25,9 +25,11 @@ components:
       type: object
       properties:
         cellIdList:
-          type: integer
+          type: array
+          items:
+            type: integer
         trackingAreaIdList:
-          $ref: 'nrNrm.yaml#/components/schemas/Tai'
+          $ref: 'nrNrm.yaml#/components/schemas/TaiList'
         servingPLMN:
           $ref: 'nrNrm.yaml#/components/schemas/PlmnId'
     GeoLoc:
@@ -55,9 +57,13 @@ components:
       type: object
       properties:
         affinityEAS:
-          type: string
+          type: array
+          items:
+            type: string
         antiAffinityEAS:
-          type: string
+          type: array
+          items:
+            type: string
     VirtualResource:
       type: object
       properties:
@@ -65,6 +71,8 @@ components:
           type: integer
         virtualDisk:
           type: integer
+        virutalCPU:
+          type: string
     SoftwareImageInfo:
       type: object
       properties:
@@ -72,6 +80,10 @@ components:
           type: integer
         minimumRAM:
           type: integer
+        discFormat:
+          type: string
+        operatingSystem:
+          type: string
         swImageRef:
           type: string
     RegistrationInfo:
@@ -139,13 +151,17 @@ components:
                     eASIdentifier:
                       type: string
                     eESAddress:
-                      type: string
+                      type: array
+                      items:
+                        type: string
                     eASRequirementsRef:
                       $ref: 'comDefs.yaml#/components/schemas/Dn'
                     eESFunctionRef:
                       $ref: 'comDefs.yaml#/components/schemas/DnList'
                     eASAddress:
-                      type: string
+                      type: array
+                      items:
+                        type: string
                     registrationInfo:
                       $ref: '#/components/schemas/RegistrationInfo'  
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
@@ -162,9 +178,13 @@ components:
                     eESIdentifier:
                       type: string
                     eESServingLocation:
-                      $ref: '#/components/schemas/ServingLocation'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/ServingLocation'
                     eESAddress:
-                      type: string
+                      type: array
+                      items:
+                        type: string
                     softwareImageInfo:
                       $ref: '#/components/schemas/SoftwareImageInfo'
                     serviceContinuitySupport:
@@ -192,7 +212,7 @@ components:
                     edgeDataNetworkRef:
                       $ref: 'comDefs.yaml#/components/schemas/DnList'
                     eESFuncitonRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/DnList'
                     softwareImageInfo:
                       $ref: '#/components/schemas/SoftwareImageInfo'
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'