diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index ae61bea710357fa6c7ea2657d214170f0e6e5f88..343062cfc1c0809ba05874aaecad28e751e45bc1 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -126,7 +126,7 @@ components:
     TACList:
       type: array
       items:
-        $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTac'
+        $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
     WeightFactor:
       type: integer
     UdmInfo:
@@ -648,7 +648,7 @@ components:
     TaiList:
       type: array
       items:
-        $ref: 'TS28541_NrNrm.yaml#/components/schemas/Tai' 
+        $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' 
 
 #-------- Definition of concrete IOCs --------------------------------------------
     ProvMnS:
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index a8900cf904b29498a4dc05cc3a157fd4ea6d2b47..1329bd9bd3dd6c7fb625a0e2b2ceb98a51b98d06 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -97,30 +97,22 @@ components:
       type: integer
       maximum: 503
     NrTac:
-      type: integer
-      maximum: 16777215
+      $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
     NrTacList:
       type: array
       items:
-        $ref: '#/components/schemas/NrTac'
-    Tai:
-      type: object
-      properties:
-        plmnId:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
-        nrTac:
-          $ref: '#/components/schemas/NrTac'
+        $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
     TaiList:
       type: array
       items:
-        $ref: '#/components/schemas/Tai' 
+        $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' 
     BackhaulAddress:
       type: object
       properties:
         gnbId:
           $ref: '#/components/schemas/GnbId'
         tai:
-          $ref: "#/components/schemas/Tai"
+          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai'
     MappingSetIDBackhaulAddress:
       type: object
       properties:
@@ -930,7 +922,7 @@ components:
                     nrPci:
                       $ref: '#/components/schemas/NrPci'
                     nrTac:
-                      $ref: '#/components/schemas/NrTac'
+                      $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
                     arfcnDL:
                       type: integer
                     arfcnUL:
@@ -1009,7 +1001,7 @@ components:
             plmnInfoList:
               $ref: '#/components/schemas/PlmnInfoList'
             nrTac:
-              $ref: '#/components/schemas/NrTac'
+              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
 
     NRFrequency-Single:
       allOf: