diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index a820a9a02e755620e204ca4a05fd79821d197dfa..a99ad9fb4f1e0ccc07204099be8a0560d9972c3e 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
     AusfInfo:
@@ -653,7 +653,7 @@ components:
     TaiList:
       type: array
       items:
-        $ref: 'TS28541_NrNrm.yaml#/components/schemas/Tai' 
+        $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' 
     SupiRange:
       type: object
       properties:
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 0b2a1233c1fd4c53a54d09ab28ca9e2fddbdeb0f..3f72009bc152ce62aced109141eef389ecffd36c 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:
@@ -949,7 +941,7 @@ components:
                     nrPci:
                       $ref: '#/components/schemas/NrPci'
                     nrTac:
-                      $ref: '#/components/schemas/NrTac'
+                      $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
                     arfcnDL:
                       type: integer
                     arfcnUL:
@@ -1039,7 +1031,7 @@ components:
             plmnInfoList:
               $ref: '#/components/schemas/PlmnInfoList'
             nrTac:
-              $ref: '#/components/schemas/NrTac'
+              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
 
     NRFrequency-Single:
       allOf: