diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index d559e6a293d386bd511904fa46c39a8162cfd03a..ae78c0b9db697aed9555d03b529f38bc425fd285 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -327,23 +327,9 @@ components:
         ipv6Address:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
 
-    CellIndividualOffset:
-      type: object
-      properties:
-        rsrpOffsetSSB:
-          type: integer
-        rsrqOffsetSSB:
-          type: integer
-        sinrOffsetSSB:
-          type: integer
-        rsrpOffsetCSI-RS:
-          type: integer
-        rsrqOffsetCSI-RS:
-          type: integer
-        sinrOffsetCSI-RS:
-          type: integer
     QOffsetRange:
       type: integer
+      default: 0
       enum:
         - -24
         - -22
@@ -376,21 +362,6 @@ components:
         - 3
         - 2
         - 1
-    QOffsetRangeList:
-      type: object
-      properties:
-        rsrpOffsetSSB:
-          $ref: '#/components/schemas/QOffsetRange'
-        rsrqOffsetSSB:
-          $ref: '#/components/schemas/QOffsetRange'
-        sinrOffsetSSB:
-          $ref: '#/components/schemas/QOffsetRange'
-        rsrpOffsetCSI-RS:
-          $ref: '#/components/schemas/QOffsetRange'
-        rsrqOffsetCSI-RS:
-          $ref: '#/components/schemas/QOffsetRange'
-        sinrOffsetCSI-RS:
-          $ref: '#/components/schemas/QOffsetRange'
     QOffsetFreq:
       type: number
     TReselectionNRSf:
@@ -1204,7 +1175,11 @@ components:
                     nRTCI:
                       type: integer
                     cellIndividualOffset:
-                      $ref: '#/components/schemas/CellIndividualOffset'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/QOffsetRange'
+                      minItems: 6
+                      maxItems: 6
                     adjacentNRCellRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     nRFreqRelationRef:
@@ -1241,7 +1216,11 @@ components:
                   type: object
                   properties:
                     offsetMO:
-                      $ref: '#/components/schemas/QOffsetRangeList'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/QOffsetRange'
+                      minItems: 6
+                      maxItems: 6
                     blockListEntry:
                       type: array
                       items:
@@ -1304,7 +1283,11 @@ components:
               type: object
               properties:
                     cellIndividualOffset:
-                      $ref: '#/components/schemas/CellIndividualOffset'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/QOffsetRange'
+                      minItems: 6
+                      maxItems: 6
                     blackListEntry:
                       type: array
                       items: