diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 38d2dc12cdd72b9beacac5439198c2852f06ea07..167f23075314ef330f0295afe45da33c245a69ed 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.11.0
+  version: 16.15.0
   description: >-
     OAS 3.0.1 specification of the 5GC NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -67,7 +67,7 @@ components:
         nFStatus:
           $ref: '#/components/schemas/NFStatus'
         plmn:
-          $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         sNssais:
           $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
         fqdn:
@@ -101,7 +101,7 @@ components:
         apiPrfix:
           type: string
         allowedPlmns:
-          $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         allowedNfTypes:
           type: array
           items:
@@ -1006,7 +1006,7 @@ components:
                 - type: object
                   properties:
                     plmnId:
-                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                     sEPPType:
                       $ref: '#/components/schemas/SEPPType'
                     sEPPId:
@@ -1124,7 +1124,7 @@ components:
                 - type: object
                   properties:
                     plmnId:
-                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                     sEPPId:
                       type: integer
                     fqdn:
@@ -1457,7 +1457,7 @@ components:
                 - type: object
                   properties:
                     remotePlmnId:
-                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                     remoteSeppAddress:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr'
                     remoteSeppId:
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 2892635a9c60fa5ae05a3608d2a571a709485bf6..436988652889f33efae63efd1888dc540e38a838 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.11.0
+  version: 16.15.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -44,25 +44,15 @@ components:
         sd:
           type: string
 
-    Mnc:
-      type: string
-      pattern: '[0-9]{3}|[0-9]{2}'
-    PlmnId:
-      type: object
-      properties:
-        mcc:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc'
-        mnc:
-          $ref: '#/components/schemas/Mnc'
     PlmnIdList:
       type: array
       items:
-        $ref: '#/components/schemas/PlmnId'
+        $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
     PlmnInfo:
       type: object
       properties:
         plmnId:
-          $ref: '#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         snssai:
           $ref: '#/components/schemas/Snssai'
     PlmnInfoList:
@@ -96,7 +86,7 @@ components:
       type: object
       properties:
         plmnId:
-          $ref: '#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         nrTac:
           $ref: '#/components/schemas/NrTac'
 
@@ -253,7 +243,7 @@ components:
       type: object
       properties:
         plmnId:
-          $ref: '#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         snssai:
           $ref: '#/components/schemas/Snssai'
     RrmPolicyMemberList:
@@ -553,7 +543,7 @@ components:
         TceID:
           type: integer
         PlmnTarget:
-          $ref: '#/components/schemas/PlmnId'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
     TceMappingInfoList:
       type: array
       items:
@@ -751,7 +741,7 @@ components:
                     gnbCuName:
                       $ref: '#/components/schemas/GnbName'
                     plmnId:
-                      $ref: '#/components/schemas/PlmnId'
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                     x2BlackList:
                       $ref: '#/components/schemas/GGnbIdList'
                     xnBlackList:
@@ -1471,7 +1461,7 @@ components:
                     gnbIdLength:
                       $ref: '#/components/schemas/GnbIdLength'
                     plmnId:
-                      $ref: '#/components/schemas/PlmnId'
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml
index f876e0c6a5c4623b486c036422f8cc92d2d96e9f..fdc8a3eb7d4ad412df21eb77094318b243eff8fc 100644
--- a/OpenAPI/TS28623_ComDefs.yaml
+++ b/OpenAPI/TS28623_ComDefs.yaml
@@ -85,6 +85,7 @@ components:
       oneOf:
         - $ref: '#/components/schemas/Ipv4Addr'
         - $ref: '#/components/schemas/Ipv6Addr'
+        - $ref: '#/components/schemas/Ipv6Prefix'        
     HostAddr:
       #  This definition will be deprecated, when all occurances of HostAddr
       #  are replaced by Host.
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index c57e9a26165fc16a03cb40de40deb557fe651eef..24ce7d80fac4c20a820bdf51eb269cad42eea89f 100644
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Generic NRM
-  version: 16.11.0
+  version: 16.14.0
   description: >-
     OAS 3.0.1 definition of the Generic NRM
     © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -148,7 +148,7 @@ components:
              - FILE_BASED_LOC_SET_BY_PRODUCER
              - FILE_BASED_LOC_SET_BY_CONSUMER
              - STREAM_BASED 
-        monitorGranularityPeriods:
+        reportingPeriods:
           type: array
           items:
             type: integer
@@ -1478,8 +1478,6 @@ components:
           $ref: '#/components/schemas/traceDepth-Type'
         traceReference:
           $ref: '#/components/schemas/traceReference-Type'
-        traceRecordingSessionReference:
-          type: string
         traceReportingFormat:
           $ref: '#/components/schemas/traceReportingFormat-Type'
         traceTarget: