diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 8583b27a00b760c2108b2d09fa231d997555f046..150f47692e13f7ec7af0e7bd4fadebf0228e7681 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -308,30 +308,9 @@ components:
           maximum: 65535
     RemoteAddress:
       $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr'
-
-    CellIndividualOffset:
-      type: object
-      properties:
-        rsrpOffsetSSB:
-          type: integer
-          default: 0          
-        rsrqOffsetSSB:
-          type: integer
-          default: 0          
-        sinrOffsetSSB:
-          type: integer
-          default: 0          
-        rsrpOffsetCSI-RS:
-          type: integer
-          default: 0          
-        rsrqOffsetCSI-RS:
-          type: integer
-          default: 0          
-        sinrOffsetCSI-RS:
-          type: integer
-          default: 0          
     QOffsetRange:
       type: integer
+      default: 0
       enum:
         - -24
         - -22
@@ -364,21 +343,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
       default: 0      
@@ -1375,7 +1339,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:
@@ -1412,7 +1380,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:
@@ -1475,7 +1447,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: