diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml
index a02c838bf6245ce69f9b2ef5cb2b50626bd96c1b..888420bd1c6ac7fe4669ad15e1a5475d405df3d8 100755
--- a/OpenAPI/5gcNrm.yaml
+++ b/OpenAPI/5gcNrm.yaml
@@ -213,7 +213,7 @@ components:
         allowedSNPNs:
           type: array
           items:
-            $ref: 'nrNrm.yaml#/components/schemas/SnpnInfo'
+            $ref: '#/components/schemas/SnpnInfo'
         allowedNfTypes:
           type: array
           items:
@@ -623,6 +623,26 @@ components:
       type: array
       items:
         $ref: 'nrNrm.yaml#/components/schemas/Snssai'
+    SnpnId:
+      type: object
+      properties:
+        mcc:
+          $ref: 'comDefs.yaml#/components/schemas/Mcc'
+        mnc:
+          $ref: 'comDefs.yaml#/components/schemas/Mnc'
+        nid:
+          type: string
+    SnpnInfo:
+      type: object
+      properties:
+        snpnId:
+          $ref: '#/components/schemas/SnpnId'
+        snssai:
+          $ref: 'nrNrm.yaml#/components/schemas/Snssai'
+    TaiList:
+      type: array
+      items:
+        $ref: 'nrNrm.yaml#/components/schemas/Tai' 
 
 #-------- Definition of concrete IOCs --------------------------------------------
 
@@ -731,11 +751,11 @@ components:
                     interPlmnFQDN:
                       type: string
                     taiList:
-                      $ref: 'nrNrm.yaml#/components/schemas/TaiList'
+                      $ref: '#/components/schemas/TaiList'
                     taiRangeList:
                       type: array
                       items:
-                        $ref: 'nrNrm.yaml#/components/schemas/TaiRange'
+                        $ref: '#/components/schemas/TaiRange'
                     weightFactor:
                       $ref: '#/components/schemas/WeightFactor'
                     snssaiList:
@@ -856,7 +876,7 @@ components:
                     taiRangeList:
                       type: array
                       items:
-                        $ref: 'nrNrm.yaml#/components/schemas/TaiRange'
+                        $ref: '#/components/schemas/TaiRange'
                     pwgFqdn:
                       type: string
                     pgwAddrList:
@@ -1309,7 +1329,7 @@ components:
                       type: boolean
                     taiList:
                       items:
-                        $ref: 'nrNrm.yaml#/components/schemas/TaiList'
+                        $ref: '#/components/schemas/TaiList'
                     taiRangeList:
                       type: array
                       items:
@@ -1340,7 +1360,7 @@ components:
                         $ref: '#/components/schemas/NsacfInfoSnssai'
                     taiList:
                       items:
-                        $ref: 'nrNrm.yaml#/components/schemas/TaiList'
+                        $ref: '#/components/schemas/TaiList'
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml
index f1ab99cefc7559a1187f54e60fef3302e3fa4ad8..ad78bd16e9c9b5338d63467c533942cba5f9fb6d 100755
--- a/OpenAPI/nrNrm.yaml
+++ b/OpenAPI/nrNrm.yaml
@@ -69,22 +69,6 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/PlmnInfo'
-    SnpnId:
-      type: object
-      properties:
-        mcc:
-          $ref: 'comDefs.yaml#/components/schemas/Mcc'
-        mnc:
-          $ref: '#/components/schemas/Mnc'
-        nid:
-          type: string
-    SnpnInfo:
-      type: object
-      properties:
-        snpnId:
-          $ref: '#/components/schemas/SnpnId'
-        snssai:
-          $ref: '#/components/schemas/Snssai'
     cagId:
       type: string
     nid:
@@ -136,25 +120,6 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/Tai' 
-    NrtacRange: 
-      type: object
-      properties:
-        nRTACstart:
-          type: string
-        nRTACend:
-          type: string
-        nRTACpattern:
-          type: string
-    TaiRange:
-      type: object
-      properties:
-        plmnId:
-          $ref: '#/components/schemas/PlmnId'
-        nRTACRangeList:
-          type: array
-          items: 
-             $ref: '#/components/schemas/NrtacRange'
-
     BackhaulAddress:
       type: object
       properties: