diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml
index fd61fca9d49f22ec6ead16a160b115f712e4ef0b..042b94c04d3172da0439dc193641f1c5123e0e74 100644
--- a/OpenAPI/5gcNrm.yaml
+++ b/OpenAPI/5gcNrm.yaml
@@ -265,26 +265,7 @@ components:
           type: integer
         exponent:
           type: integer
-    FiveQICharacteristics:
-      type: object
-      properties:
-        fiveQIValue:
-          type: integer
-        resourceType:
-          type: string
-          enum:
-            - GBR
-            - NonGBR
-        priorityLevel:
-          type: integer
-        packetDelayBudget:
-          type: integer
-        packetErrorRate:
-          $ref: '#/components/schemas/PacketErrorRate'
-        averagingWindow:
-          type: integer
-        maximumDataBurstVolume:
-          type: integer
+
 
 
     GtpUPathDelayThresholdsType:
@@ -1101,8 +1082,6 @@ components:
                       $ref: '#/components/schemas/ManagedNFProfile'
                     capabilityList:
                       $ref: '#/components/schemas/CapabilityList'
-                    isINEF:
-                      type: boolean
                     isCAPIFSup:
                       type: boolean
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
@@ -1637,6 +1616,32 @@ components:
                       items:
                         $ref: '#/components/schemas/FiveQiDscpMapping'
 
+    FiveQICharacteristics-Single:
+      allOf:
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - type: object
+          properties:
+            fiveQIValue:
+              type: integer
+            resourceType:
+              type: string
+              enum:
+                - GBR
+                - NonGBR
+            priorityLevel:
+              type: integer
+            packetDelayBudget:
+              type: integer
+            packetErrorRate:
+              $ref: '#/components/schemas/PacketErrorRate'
+            averagingWindow:
+              type: integer
+            maximumDataBurstVolume:
+              type: integer
+    FiveQICharacteristics-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/FiveQICharacteristics-Single' 
     Configurable5QISet-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -1649,7 +1654,7 @@ components:
                     configurable5QIs:
                       type: array
                       items:
-                        $ref: '#/components/schemas/FiveQICharacteristics'  
+                        $ref: '#/components/schemas/FiveQICharacteristics-Multiple'  
    
     Dynamic5QISet-Single:
       allOf:
@@ -1663,7 +1668,7 @@ components:
                     dynamic5QIs:
                       type: array
                       items:
-                        $ref: '#/components/schemas/FiveQICharacteristics'                           
+                        $ref: '#/components/schemas/FiveQICharacteristics-Multiple'                           
                       
     GtpUPathQoSMonitoringControl-Single:
       allOf:
diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml
index 9355f53e958d42219e74b5782f326871684f5b6a..0911920a2dbaa9c106d44bc144ac9dd8d09b6f25 100644
--- a/OpenAPI/genericNrm.yaml
+++ b/OpenAPI/genericNrm.yaml
@@ -1206,6 +1206,10 @@ components:
           $ref: '#/components/schemas/TraceJob-Multiple'
         AlarmList:
           $ref: '#/components/schemas/AlarmList-Single'
+        MnsRegistry:
+          type: array
+          items:
+            $ref: '#/components/schemas/MnsRegistry'
     ManagedElement-ncO:
       type: object
       properties:
@@ -1342,6 +1346,18 @@ components:
         TraceJob:
           $ref: '#/components/schemas/TraceJob-Multiple'
 
+    MnsRegistry:
+      type: object
+      properties:
+        mnsLabel:
+          type: string
+        mnsType:
+          type: string
+        mnsVersion:
+          type: string
+        mnsAddress:
+          type: string
+
 #-------- Definition of concrete IOCs --------------------------------------------
 
     VsDataContainer-Single:
diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml
index 6e12a4d8b30872e2d823690ca657ce8379395e3b..046c85abe2103a9124aff433ad7ff8f2b370814a 100644
--- a/OpenAPI/sliceNrm.yaml
+++ b/OpenAPI/sliceNrm.yaml
@@ -465,6 +465,18 @@ components:
       oneOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr'
         - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr'
+    
+    LogicInterfaceInfo:
+      type: object
+      properties:
+         logicalInterfceType:
+           type: string
+           enum: 
+            - VLAN
+            - MPLS
+            - Segment
+         logicalInterfceId:
+           type: string
 
     ServiceProfileList:
        type: array
@@ -538,6 +550,8 @@ components:
                       $ref: '#/components/schemas/SliceProfileList'
                     epTransportRefList:
                       $ref: 'genericNrm.yaml#/components/schemas/DnList'
+                    priorityLabel:
+                      type: integer
 
     EP_Transport-Single:
       allOf:
@@ -549,8 +563,8 @@ components:
               properties:
                 ipAddress:
                   $ref: '#/components/schemas/IpAddress'
-                logicInterfaceId:
-                  type: string 
+                logicInterfaceInfo:
+                  $ref: '#/components/schemas/LogicInterfaceInfo'
                 nextHopInfo:
                   type: string 
                 qosProfile:
diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang
index fdb701ed41f2dba7e9b1164e983fbe02d02fb29b..7ab28015d908fd93e349c5f6dec611cc54c74cb2 100755
--- a/yang-models/_3gpp-5gc-nrm-neffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang
@@ -43,10 +43,6 @@ module _3gpp-5gc-nrm-neffunction {
       reference "3GPP TS 23.003";
       type string;
     }
-
-    leaf isINEF {
-      type boolean;
-    }
     
     leaf isCAPIFSup {
       type boolean;