diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 8a3e317a1d84271c75d8798808c535c6981c7ed9..acfbbd4acdfd4e0a20b10aa8252ea44bc6bd0992 100644
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: 3GPP 5GC NRM
-  version: 16.19.0
+  version: 16.20.0
   description: >-
     OAS 3.0.1 specification of the 5GC NRM
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -762,7 +762,8 @@ components:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-
+                    predefinedPccRuleSetRefs:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -776,8 +777,6 @@ components:
               $ref: '#/components/schemas/EP_N16-Multiple'
             EP_Rx:
               $ref: '#/components/schemas/EP_Rx-Multiple'
-            PredefinedPccRuleSet:
-              $ref: '#/components/schemas/PredefinedPccRuleSet-Single'
 
     AusfFunction-Single:
       allOf:
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 329e298eefc2692f57efd38e075dd1fb4f28af2b..57f4ca808608155cd84962e7560fb2a2c100c122 100644
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: NR NRM
-  version: 16.18.0
+  version: 16.20.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -95,75 +95,81 @@ components:
           type: integer
         backhaulAddress:
           $ref: '#/components/schemas/BackhaulAddress'
-    IntraRatEsActivationOriginalCellLoadParameters:
+    LoadTimeThreshold:
       type: object
       properties:
         loadThreshold:
           type: integer
         timeDuration:
           type: integer
+    IntraRatEsActivationOriginalCellLoadParameters:
+      $ref: '#/components/schemas/LoadTimeThreshold'
     IntraRatEsActivationCandidateCellsLoadParameters:
-      type: object
-      properties:
-        loadThreshold:
-          type: integer
-        timeDuration:
-          type: integer
+      $ref: '#/components/schemas/LoadTimeThreshold'
     IntraRatEsDeactivationCandidateCellsLoadParameters:
-      type: object
-      properties:
-        loadThreshold:
-          type: integer
-        timeDuration:
-          type: integer
+      $ref: '#/components/schemas/LoadTimeThreshold'
     EsNotAllowedTimePeriod:
       type: object
       properties:
-        startTimeandendTime:
+        startTime:
           type: string
-        periodOfDay:
+          description: >-
+            Time of day is in HH:MM or H:MM 24-hour format per UTC time zone.
+            Examples, 20:15:00, 20:15:00-08:00 (for 8 hours behind UTC).
+        endTime:
           type: string
-        daysOfWeekList:
-          type: string
-        listoftimeperiods:
+          description: >-
+            Time of day is in HH:MM or H:MM 24-hour format per UTC time zone.
+            Examples, 20:15:00, 20:15:00-08:00 (for 8 hours behind UTC).
+        daysOfWeek:
           type: string
+          enum:
+            - MONDAY
+            - TUESDAY
+            - WEDNESDAY
+            - THURSDAY
+            - FRIDAY
+            - SATURDAY
+            - SUNDAY
     InterRatEsActivationOriginalCellParameters:
-      type: object
-      properties:
-        loadThreshold:
-          type: integer
-        timeDuration:
-          type: integer
+      $ref: '#/components/schemas/LoadTimeThreshold'
     InterRatEsActivationCandidateCellParameters:
-      type: object
-      properties:
-        loadThreshold:
-          type: integer
-        timeDuration:
-          type: integer
+      $ref: '#/components/schemas/LoadTimeThreshold'
     InterRatEsDeactivationCandidateCellParameters:
-      type: object
-      properties:
-        loadThreshold:
-          type: integer
-        timeDuration:
-          type: integer
+      $ref: '#/components/schemas/LoadTimeThreshold'
 
     UeAccProbabilityDist:
+      type: array
+      items:
+        $ref: '#/components/schemas/UeAccProbability'
+    UeAccProbability:
       type: object
       properties:
         targetProbability:
           type: integer
-        numberofpreamblessent:
+          minimum: 0
+          maximum: 100
+        numberOfPreamblesSent:
           type: integer
+          minimum: 0
+          maximum: 200
 
     UeAccDelayProbabilityDist:
+      type: array
+      items:
+        $ref: '#/components/schemas/UeAccDelayProbability'
+
+    UeAccDelayProbability:
       type: object
       properties:
         targetProbability:
           type: integer
-        accessdelay:
+          minimum: 0
+          maximum: 100
+        accessDelay:
           type: integer
+          minimum: 10
+          maximum: 560
 
     NRPciList:
       type: array
@@ -401,6 +407,8 @@ components:
           type: integer
         rimRSCommonCarrierReferencePoint:
          type: integer
+         minimum: 0
+         maximum: 3279165
         rimRSStartingFrequencyOffsetIdList:
           type: array
           items:
@@ -426,9 +434,9 @@ components:
           enum:
             - ENABLE
             - DISABLE          
-        RIMRSScrambleTimerMultiplier:
+        rIMRSScrambleTimerMultiplier:
           type: integer
-        RIMRSScrambleTimerOffset:
+        rIMRSScrambleTimerOffset:
           type: integer
 
     TimeDomainPara: