Merge "[DCAEGEN2-SERVICES] Fix and resolve remote references in st. def. domain"

18 files changed, 2407 insertions, 1372 deletions

diff --git a/kubernetes/dcaegen2-services/resources/external/map/schema-map.json b/kubernetes/dcaegen2-services/resources/external/map/schema-map.json
index 498521cfee..a70c597bff 100644
--- a/kubernetes/dcaegen2-services/resources/external/map/schema-map.json
+++ b/kubernetes/dcaegen2-services/resources/external/map/schema-map.json
@@ -1,18 +1,18 @@
 [
   {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/faultMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/faultMnS.yaml"
+    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml",
+    "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml"
   },
   {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/FileDataReportingMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/FileDataReportingMnS.yaml"
+    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml",
+    "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml"
   },
   {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/heartbeatNtf.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/heartbeatNtf.yaml"
+    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml",
+    "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml"
   },
   {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/provMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/provMnS.yaml"
+    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml",
+    "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml"
   }
 ]
\ No newline at end of file
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/5gcNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/5gcNrm.yaml
index 16a01b44c8..67512d7648 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/5gcNrm.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/5gcNrm.yaml
@@ -1,13 +1,13 @@
 openapi: 3.0.1
 info:
   title: 3GPP 5GC NRM
-  version: 16.6.0
+  version: 16.5.0
   description: >-
     OAS 3.0.1 specification of the 5GC NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
-  description: 3GPP TS 28.541 V16.6.0; 5G NRM, 5GC NRM
+  description: 3GPP TS 28.541 V16.4.0; 5G NRM, 5GC NRM
   url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/
 paths: {}
 components:
@@ -223,7 +223,7 @@ components:
         commModelType:
           $ref: '#/components/schemas/CommModelType'
         targetNFServiceList:
-          $ref: 'comDefs.yaml#/components/schemas/DnList'
+          $ref: 'genericNrm.yaml#/components/schemas/DnList'
         commModelConfiguration:
           type: string
     CommModelList:
@@ -240,7 +240,7 @@ components:
         fiveQIValues:
           type: array
           items:
-            type: integer
+          type: integer
         dscp:
           type: integer
 
@@ -298,144 +298,6 @@ components:
         thresholdRtt:
           type: integer
 
-    QosData:
-      type: object
-      properties:
-        qosId:
-          type: string
-        fiveQIValue:
-          type: integer
-        maxbrUl:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
-        maxbrDl:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
-        gbrUl:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
-        gbrDl:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/BitRateRm'
-        arp:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/Arp'
-        qosNotificationControl:
-          type: boolean
-        reflectiveQos:
-          type: boolean
-        sharingKeyDl:
-          type: string
-        sharingKeyUl:
-          type: string
-        maxPacketLossRateDl:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/PacketLossRateRm'
-        maxPacketLossRateUl:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/PacketLossRateRm'
-        extMaxDataBurstVol:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/ExtMaxDataBurstVolRm'
-
-    QosDataList:
-      type: array
-      items:
-        $ref: '#/components/schemas/QosData'
-
-    SteeringMode:
-      type: object
-      properties:
-        steerModeValue:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/SteerModeValue'
-        active:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/AccessType'
-        standby:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/AccessTypeRm'
-        threeGLoad:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/Uinteger'
-        prioAcc:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/AccessType'
-
-    TrafficControlData:
-      type: object
-      properties:
-        tcId:
-          type: string
-        flowStatus:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/FlowStatus'
-        redirectInfo:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/RedirectInformation'
-        addRedirectInfo:
-          type: array
-          items:
-            $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/RedirectInformation'
-          minItems: 1
-        muteNotif:
-          type: boolean
-        trafficSteeringPolIdDl:
-          type: string
-          nullable: true
-        trafficSteeringPolIdUl:
-          type: string
-          nullable: true
-        routeToLocs:
-          type: array
-          items:
-            $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/RouteToLocation'
-        traffCorreInd:
-          type: boolean
-        upPathChgEvent:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/UpPathChgEvent'
-        steerFun:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/SteeringFunctionality'
-        steerModeDl:
-          $ref: '#/components/schemas/SteeringMode'
-        steerModeUl:
-          $ref: '#/components/schemas/SteeringMode'
-        mulAccCtrl:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/MulticastAccessControl'
-
-    TrafficControlDataList:
-      type: array
-      items:
-        $ref: '#/components/schemas/TrafficControlData'
-
-    PccRule:
-      type: object
-      properties:
-        pccRuleId:
-          type: string
-          description: Univocally identifies the PCC rule within a PDU session.
-        flowInfoList:
-          type: array
-          items:
-            $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/FlowInformation'
-        applicationId:
-          type: string
-        appDescriptor:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/ApplicationDescriptor'
-        contentVersion:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/ContentVersion'
-        precedence:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/Uinteger'
-        afSigProtocol:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/AfSigProtocol'
-        isAppRelocatable:
-          type: boolean
-        isUeAddrPreserved:
-          type: boolean
-        qosData:
-          type: array
-          items:
-            $ref: '#/components/schemas/QosDataList'
-        altQosParams:
-          type: array
-          items:
-            $ref: '#/components/schemas/QosDataList'
-        trafficControlData:
-          type: array
-          items:
-            $ref: '#/components/schemas/TrafficControlDataList'
-        conditionData:
-            $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/ConditionData'
-        tscaiInputDl:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer'
-        tscaiInputUl:
-          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer'
-
 
 #-------- Definition of concrete IOCs --------------------------------------------
 
@@ -466,8 +328,6 @@ components:
               $ref: '#/components/schemas/AmfRegion-Multiple'
             Configurable5QISet:
               $ref: '#/components/schemas/Configurable5QISet-Multiple'
-            Dynamic5QISet:
-              $ref: '#/components/schemas/Dynamic5QISet-Multiple'
 
     ManagedElement-Single:
       allOf:
@@ -518,8 +378,6 @@ components:
               $ref: '#/components/schemas/NefFunction-Multiple'
             Configurable5QISet:
               $ref: '#/components/schemas/Configurable5QISet-Multiple'
-            Dynamic5QISet:
-              $ref: '#/components/schemas/Dynamic5QISet-Multiple'
 
     AmfFunction-Single:
       allOf:
@@ -542,7 +400,7 @@ components:
                     snssaiList:
                       $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
                     amfSet:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
                     managedNFProfile:
                       $ref: '#/components/schemas/ManagedNFProfile'
                     commModelList:
@@ -632,10 +490,8 @@ components:
                       $ref: '#/components/schemas/ManagedNFProfile'
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
-                    configurable5QISetRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
-                    dynamic5QISetRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
+                    Configurable5QISetRef:
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
 
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
@@ -658,8 +514,6 @@ components:
               $ref: '#/components/schemas/GtpUPathQoSMonitoringControl-Single'
             QFQoSMonitoringControl:
               $ref: '#/components/schemas/QFQoSMonitoringControl-Single'
-            PredefinedPccRuleSet:
-              $ref: '#/components/schemas/PredefinedPccRuleSet-Single'
 
     UpfFunction-Single:
       allOf:
@@ -735,11 +589,6 @@ components:
                       $ref: '#/components/schemas/ManagedNFProfile'
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
-                    configurable5QISetRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
-                    dynamic5QISetRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
-
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -753,9 +602,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:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -1115,12 +961,12 @@ components:
 
     EP_N2-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1129,28 +975,26 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N3-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
                       $ref: 'nrNrm.yaml#/components/schemas/LocalAddress'
                     remoteAddress:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
-                    epTransportRefs:
-                      $ref: 'comDefs.yaml#/components/schemas/DnList'
     EP_N4-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1159,12 +1003,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N5-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1173,12 +1017,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N6-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1187,12 +1031,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N7-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1201,12 +1045,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N8-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1215,12 +1059,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N9-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1229,12 +1073,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N10-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1243,12 +1087,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N11-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1257,12 +1101,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N12-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1271,12 +1115,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N13-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1285,12 +1129,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N14-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1299,12 +1143,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N15-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1313,12 +1157,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N16-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1327,12 +1171,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N17-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1342,12 +1186,12 @@ components:
 
     EP_N20-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1357,12 +1201,12 @@ components:
 
     EP_N21-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1371,12 +1215,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N22-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1386,12 +1230,12 @@ components:
 
     EP_N26-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1400,12 +1244,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N27-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1416,12 +1260,12 @@ components:
 
     EP_N31-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1430,12 +1274,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N32-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     remotePlmnId:
@@ -1453,12 +1297,12 @@ components:
 
     EP_S5C-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1467,12 +1311,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_S5U-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1481,12 +1325,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_Rx-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1495,12 +1339,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_MAP_SMSC-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1509,12 +1353,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_NLS-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1523,12 +1367,12 @@ components:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
     EP_NLG-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1538,7 +1382,7 @@ components:
 
     FiveQiDscpMappingSet-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1552,7 +1396,7 @@ components:
 
     Configurable5QISet-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1563,24 +1407,9 @@ components:
                       type: array
                       items:
                         $ref: '#/components/schemas/FiveQICharacteristics'
-
-    Dynamic5QISet-Single:
-      allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
-        - type: object
-          properties:
-            attributes:
-              allOf:
-                - type: object
-                  properties:
-                    dynamic5QIs:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/FiveQICharacteristics'
-
     GtpUPathQoSMonitoringControl-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1617,7 +1446,7 @@ components:
 
     QFQoSMonitoringControl-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1652,19 +1481,6 @@ components:
                     qFMeasurementPeriod:
                       type: integer
 
-    PredefinedPccRuleSet-Single:
-      allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
-        - type: object
-          properties:
-            attributes:
-              allOf:
-                - type: object
-                  properties:
-                    predefinedPccRules:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/PccRule'
 
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
 
@@ -1899,82 +1715,75 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/Configurable5QISet-Single'
-    Dynamic5QISet-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/Dynamic5QISet-Single'
-
 
 
 #------------ Definitions in TS 28.541 for TS 28.532 -----------------------------
 
     resources-5gcNrm:
       oneOf:
-       - $ref: '#/components/schemas/SubNetwork-Single'
-       - $ref: '#/components/schemas/ManagedElement-Single'
-       - $ref: '#/components/schemas/AmfFunction-Single'
-       - $ref: '#/components/schemas/SmfFunction-Single'
-       - $ref: '#/components/schemas/UpfFunction-Single'
-       - $ref: '#/components/schemas/N3iwfFunction-Single'
-       - $ref: '#/components/schemas/PcfFunction-Single'
-       - $ref: '#/components/schemas/AusfFunction-Single'
-       - $ref: '#/components/schemas/UdmFunction-Single'
-       - $ref: '#/components/schemas/UdrFunction-Single'
-       - $ref: '#/components/schemas/UdsfFunction-Single'
-       - $ref: '#/components/schemas/NrfFunction-Single'
-       - $ref: '#/components/schemas/NssfFunction-Single'
-       - $ref: '#/components/schemas/SmsfFunction-Single'
-       - $ref: '#/components/schemas/LmfFunction-Single'
-       - $ref: '#/components/schemas/NgeirFunction-Single'
-       - $ref: '#/components/schemas/SeppFunction-Single'
-       - $ref: '#/components/schemas/NwdafFunction-Single'
-       - $ref: '#/components/schemas/ScpFunction-Single'
-       - $ref: '#/components/schemas/NefFunction-Single'
+        - $ref: '#/components/schemas/SubNetwork-Single'
+        - $ref: '#/components/schemas/ManagedElement-Single'
+        - $ref: '#/components/schemas/AmfFunction-Single'
+        - $ref: '#/components/schemas/SmfFunction-Single'
+        - $ref: '#/components/schemas/UpfFunction-Single'
+        - $ref: '#/components/schemas/N3iwfFunction-Single'
+        - $ref: '#/components/schemas/PcfFunction-Single'
+        - $ref: '#/components/schemas/AusfFunction-Single'
+        - $ref: '#/components/schemas/UdmFunction-Single'
+        - $ref: '#/components/schemas/UdrFunction-Single'
+        - $ref: '#/components/schemas/UdsfFunction-Single'
+        - $ref: '#/components/schemas/NrfFunction-Single'
+        - $ref: '#/components/schemas/NssfFunction-Single'
+        - $ref: '#/components/schemas/SmsfFunction-Single'
+        - $ref: '#/components/schemas/LmfFunction-Single'
+        - $ref: '#/components/schemas/NgeirFunction-Single'
+        - $ref: '#/components/schemas/SeppFunction-Single'
+        - $ref: '#/components/schemas/NwdafFunction-Single'
+        - $ref: '#/components/schemas/ScpFunction-Single'
+        - $ref: '#/components/schemas/NefFunction-Single'
 
-       - $ref: '#/components/schemas/ExternalAmfFunction-Single'
-       - $ref: '#/components/schemas/ExternalNrfFunction-Single'
-       - $ref: '#/components/schemas/ExternalNssfFunction-Single'
-       - $ref: '#/components/schemas/ExternalSeppFunction-Single'
+        - $ref: '#/components/schemas/ExternalAmfFunction-Single'
+        - $ref: '#/components/schemas/ExternalNrfFunction-Single'
+        - $ref: '#/components/schemas/ExternalNssfFunction-Single'
+        - $ref: '#/components/schemas/ExternalSeppFunction-Single'
 
-       - $ref: '#/components/schemas/AmfSet-Single'
-       - $ref: '#/components/schemas/AmfRegion-Single'
-       - $ref: '#/components/schemas/QFQoSMonitoringControl-Single'
-       - $ref: '#/components/schemas/GtpUPathQoSMonitoringControl-Single'
+        - $ref: '#/components/schemas/AmfSet-Single'
+        - $ref: '#/components/schemas/AmfRegion-Single'
+        - $ref: '#/components/schemas/QFQoSMonitoringControl-Single'
+        - $ref: '#/components/schemas/GtpUPathQoSMonitoringControl-Single'
 
-       - $ref: '#/components/schemas/EP_N2-Single'
-       - $ref: '#/components/schemas/EP_N3-Single'
-       - $ref: '#/components/schemas/EP_N4-Single'
-       - $ref: '#/components/schemas/EP_N5-Single'
-       - $ref: '#/components/schemas/EP_N6-Single'
-       - $ref: '#/components/schemas/EP_N7-Single'
-       - $ref: '#/components/schemas/EP_N8-Single'
-       - $ref: '#/components/schemas/EP_N9-Single'
-       - $ref: '#/components/schemas/EP_N10-Single'
-       - $ref: '#/components/schemas/EP_N11-Single'
-       - $ref: '#/components/schemas/EP_N12-Single'
-       - $ref: '#/components/schemas/EP_N13-Single'
-       - $ref: '#/components/schemas/EP_N14-Single'
-       - $ref: '#/components/schemas/EP_N15-Single'
-       - $ref: '#/components/schemas/EP_N16-Single'
-       - $ref: '#/components/schemas/EP_N17-Single'
+        - $ref: '#/components/schemas/EP_N2-Single'
+        - $ref: '#/components/schemas/EP_N3-Single'
+        - $ref: '#/components/schemas/EP_N4-Single'
+        - $ref: '#/components/schemas/EP_N5-Single'
+        - $ref: '#/components/schemas/EP_N6-Single'
+        - $ref: '#/components/schemas/EP_N7-Single'
+        - $ref: '#/components/schemas/EP_N8-Single'
+        - $ref: '#/components/schemas/EP_N9-Single'
+        - $ref: '#/components/schemas/EP_N10-Single'
+        - $ref: '#/components/schemas/EP_N11-Single'
+        - $ref: '#/components/schemas/EP_N12-Single'
+        - $ref: '#/components/schemas/EP_N13-Single'
+        - $ref: '#/components/schemas/EP_N14-Single'
+        - $ref: '#/components/schemas/EP_N15-Single'
+        - $ref: '#/components/schemas/EP_N16-Single'
+        - $ref: '#/components/schemas/EP_N17-Single'
 
-       - $ref: '#/components/schemas/EP_N20-Single'
-       - $ref: '#/components/schemas/EP_N21-Single'
-       - $ref: '#/components/schemas/EP_N22-Single'
+        - $ref: '#/components/schemas/EP_N20-Single'
+        - $ref: '#/components/schemas/EP_N21-Single'
+        - $ref: '#/components/schemas/EP_N22-Single'
 
-       - $ref: '#/components/schemas/EP_N26-Single'
-       - $ref: '#/components/schemas/EP_N27-Single'
+        - $ref: '#/components/schemas/EP_N26-Single'
+        - $ref: '#/components/schemas/EP_N27-Single'
 
-       - $ref: '#/components/schemas/EP_N31-Single'
-       - $ref: '#/components/schemas/EP_N31-Single'
+        - $ref: '#/components/schemas/EP_N31-Single'
+        - $ref: '#/components/schemas/EP_N31-Single'
 
-       - $ref: '#/components/schemas/EP_S5C-Single'
-       - $ref: '#/components/schemas/EP_S5U-Single'
-       - $ref: '#/components/schemas/EP_Rx-Single'
-       - $ref: '#/components/schemas/EP_MAP_SMSC-Single'
-       - $ref: '#/components/schemas/EP_NLS-Single'
-       - $ref: '#/components/schemas/EP_NLG-Single'
-       - $ref: '#/components/schemas/Configurable5QISet-Single'
-       - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
-       - $ref: '#/components/schemas/PredefinedPccRuleSet-Single'
-       - $ref: '#/components/schemas/Dynamic5QISet-Single'
+        - $ref: '#/components/schemas/EP_S5C-Single'
+        - $ref: '#/components/schemas/EP_S5U-Single'
+        - $ref: '#/components/schemas/EP_Rx-Single'
+        - $ref: '#/components/schemas/EP_MAP_SMSC-Single'
+        - $ref: '#/components/schemas/EP_NLS-Single'
+        - $ref: '#/components/schemas/EP_NLG-Single'
+        - $ref: '#/components/schemas/Configurable5QISet-Single'
+        - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/FileDataReportingMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerDataFileReportMnS.yaml
index 01ff52f92e..dfacc14f8c 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/FileDataReportingMnS.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerDataFileReportMnS.yaml
@@ -1,47 +1,41 @@
 openapi: 3.0.1
 info:
-  title: TS 28.532 File data reporting Service
-  version: 16.6.0
+  title: TS 28.532 Performance data file reporting Service
+  version: 16.4.0
   description: >-
-    OAS 3.0.1 specification of the File data reporting Management Service © 2020,
+    OAS 3.0.1 specification of the Performance data file reporting Management Service © 2020,
     3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All
     rights reserved.
 externalDocs:
-  description: 3GPP TS 28.532 V16.5.0; Generic management services
+  description: 3GPP TS 28.532 V16.4.0; Generic management services
   url: 'http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/'
 servers:
-  - url: '{MnSRoot}/FileDataReportingMnS/{MnSversion}'
+  - url: '{MnSRoot}/PerfDataFileReportMnS/v1640'
     variables:
       MnSRoot:
         description: See subclause 4.4 of TS 32.158
         default: http://example.com/3GPPManagement
-      version:
-        description: Indicates the current version of the specification
-        default: 16.5.0
 paths:
   /Files:
     get:
       summary: Read resources of information of available files
-      description: With HTTP GET, resources of information of available files are read. The resources to be read are identified with the path component (base resource) and the query component (fileaType, beginTime and endTime) of the URI. The fields query component allows to select the resource properties to be returned.
+      description: 'With HTTP GET, resources of information of available files are read. The resources to be read are identified with the path component (base resource) and the query component (managementDataType, beginTime and endTime) of the URI. The fields query component allows to select the resource properties to be returned.'
       parameters:
-        - name: fileType
+        - name: managementDataType
           in: query
           description: This parameter identifies the type of management data that the file contains to select the resources from the collection resources identified with the path component of the URI.
           required: true
-          schema:
-            $ref: '#/components/schemas/fileType-Type'
+          $ref: '#/components/schemas/managementDataType-Type'
         - name: beginTime
           in: query
           description: This parameter identifies the time stamp no later than which the file became available to select the resources from the collection resources identified with the path component of the URI.
           required: true
-          schema:
-            $ref: '#/components/schemas/dateTime-Type'
+          $ref: '#/components/schemas/dateTime-Type'
         - name: endTime
           in: query
           description: This parameter identifies the time stamp no earlier than which the file became available to select the resources from the collection resources identified with the path component of the URI.
           required: true
-          schema:
-            $ref: '#/components/schemas/dateTime-Type'
+          $ref: '#/components/schemas/dateTime-Type'
       responses:
         '200':
           description: 'Success case ("200 OK"). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.'
@@ -190,8 +184,6 @@ components:
           type: string
         fileFormat:
           type: string
-        fileType:
-          $ref: '#/components/schemas/fileType-Type'
     error-ResponseType:
       type: object
       properties:
@@ -200,13 +192,10 @@ components:
           properties:
             errorInfo:
               type: string
-    fileType-Type:
+    managementDataType-Type:
       type: string
       enum:
-        - PERFORMANCE
-        - TRACE
-        - ANALYTICS
-        - PROPRIETARY
+        - PM
     header-Type:
       description: Header used in notifications as notification header
       type: object
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerMeasJobCtlMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerMeasJobCtlMnS.yaml
new file mode 100644
index 0000000000..b6abe58b22
--- /dev/null
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerMeasJobCtlMnS.yaml
@@ -0,0 +1,280 @@
+openapi: 3.0.1
+info:
+  title: TS 28.550 Performance Measurement Job Control Service
+  version: 16.5.0
+  description: >-
+    OAS 3.0.1 specification of the Performance Measurement Job Control Service
+    @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.550 V16.5.0; Performance assurance
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.550/
+servers:
+  - url: 'http://{URI-DN-prefix}/{root}/PerfMeasJobCtrlMnS/v1650/{LDN-first-part}'
+    variables:
+      URI-DN-prefix:
+        description: See subclause 4.4 of TS 32.158
+        default: example.com
+      root:
+        description: See subclause 4.4 of TS 32.158
+        default: 3GPPManagement
+      LDN-first-part:
+        description: See subclause 4.4 of TS 32.158
+        default: ''
+paths:
+  /measJobs:
+    post:
+      summary: Create a measurement job
+      description: To create a measurement job the representation of the measurement job is POSTed on the /measJobs collection resource.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/measJobCreation-RequestType'
+      responses:
+        '201':
+          description: Success case ("201 Created"). The representation of the newly created measurement job resource shall be returned.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/measJobCreation-ResponseType'
+        '202':
+          description: Partial success case ("202 Partically created"). The representation of the newly created measurement job resource with unsupported list shall be returned.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/measJobCreation-ResponseType'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-ResponseType'
+    get:
+      summary: Read resources of measurement jobs
+      description: 'With HTTP GET, resources of measurement jobs are read. The resources to be read are identified with the path component (base resource) and the query component (jobIdList) of the URI. The fields query component allows to select the resource properties to be returned.'
+      parameters:
+        - name: jobIdList
+          in: query
+          description: This parameter identifies the list of jobId to select the resources from the collection resources identified with the path component of the URI.
+          required: true
+          schema:
+            type: array
+            items:
+              type: string
+      responses:
+        '200':
+          description: 'Success case ("200 OK"). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.'
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/measJobsRetrieval-ResponseType'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-ResponseType'
+  '/measJobs/{jobId}':
+    get:
+      summary: Read resource of a single measurement job
+      description: 'With HTTP GET, resource of a measurement job is read. The resource to be read is identified with the path component of the URI.'
+      parameters:
+        - name: jobId
+          in: path
+          description: Identifies the measurement job to be read.
+          required: true
+          schema:
+            $ref: '#/components/schemas/uri-Type'
+      responses:
+        '200':
+          description: 'Success case ("200 OK"). The resource identified in the path for retrieval is returned in the response message body. '
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/measJobsRetrieval-ResponseType'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-ResponseType'
+    delete:
+      summary: Delete a single measurement job
+      description: The measurement job is deleted by deleting the corresponding measurement job resource. The resource to be deleted is identified with the path component of the URI.
+      parameters:
+        - name: jobId
+          in: path
+          description: Identifies the measurement job to be deleted.
+          required: true
+          schema:
+            $ref: '#/components/schemas/uri-Type'
+      responses:
+        '204':
+          description: Success case ("204 No Content"). The measurement job resource has been deleted. The response message body is absent.
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-ResponseType'
+components:
+  schemas:
+    dateTime-Type:
+      type: string
+      format: date-Time
+    uri-Type:
+      type: string
+    measJobCreation-RequestType:
+      type: object
+      properties:
+        iOCName:
+          type: string
+        iOCInstanceList:
+          type: array
+          items:
+            $ref: '#/components/schemas/uri-Type'
+        measurementCategoryList:
+          type: array
+          items:
+            type: string
+        reportingMethod:
+          $ref: '#/components/schemas/reportingMethod-Type'
+        granularityPeriod:
+          type: integer
+        reportingPeriod:
+          type: integer
+        startTime:
+          $ref: '#/components/schemas/dateTime-Type'
+        stopTime:
+          $ref: '#/components/schemas/dateTime-Type'
+        schedule:
+          $ref: '#/components/schemas/schedule-Type'
+        streamTarget:
+          type: string
+        priority:
+          $ref: '#/components/schemas/priority-Type'
+        reliability:
+          type: string
+    measJobCreation-ResponseType:
+      type: object
+      properties:
+        unsupportedList:
+          type: array
+          items:
+            $ref: '#/components/schemas/unsupportedMeas-Type'
+    measJobsRetrieval-ResponseType:
+      type: object
+      properties:
+        jobInfoList:
+          type: array
+          items:
+            $ref: '#/components/schemas/measJobInfo-ResourceType'
+    error-ResponseType:
+      type: object
+      properties:
+        error:
+          type: object
+          properties:
+            errorInfo:
+              type: string
+    measJobInfo-ResourceType:
+      type: object
+      properties:
+        href:
+          $ref: '#/components/schemas/uri-Type'
+        iOCName:
+          type: string
+        iOCInstanceList:
+          type: array
+          items:
+            $ref: '#/components/schemas/uri-Type'
+        measurementCategoryList:
+          type: array
+          items:
+            type: string
+        reportingMethod:
+          $ref: '#/components/schemas/reportingMethod-Type'
+        granularityPeriod:
+          type: integer
+        reportingPeriod:
+          type: integer
+        startTime:
+          $ref: '#/components/schemas/dateTime-Type'
+        stopTime:
+          $ref: '#/components/schemas/dateTime-Type'
+        schedule:
+          $ref: '#/components/schemas/schedule-Type'
+        streamTarget:
+          type: string
+        priority:
+          $ref: '#/components/schemas/priority-Type'
+        reliability:
+          type: string
+    schedule-Type:
+      type: object
+      properties:
+        scheduleOption:
+          $ref: '#/components/schemas/scheduleOption-Type'
+        dailySchedule:
+          type: array
+          items:
+            $ref: '#/components/schemas/timeInterval-Type'
+        weeklySchedule:
+          type: array
+          items:
+            $ref: '#/components/schemas/scheduleOfDay-Type'
+    timeInterval-Type:
+      type: object
+      properties:
+        intervalStart:
+          type: string
+          format: Time
+        intervalEnd:
+          type: string
+          format: Time
+    scheduleOfDay-Type:
+      type: object
+      properties:
+        dayOfWeek:
+          $ref: '#/components/schemas/dayOfWeek-Type'
+        intervalsOfDay:
+          type: array
+          items:
+            $ref: '#/components/schemas/timeInterval-Type'
+    unsupportedMeas-Type:
+      type: object
+      properties:
+        iOCInstance:
+          $ref: '#/components/schemas/uri-Type'
+        measurementTypeName:
+          type: string
+        reason:
+          type: string
+    reportingMethod-Type:
+      type: string
+      enum:
+        - file
+        - streaming
+    priority-Type:
+      type: string
+      enum:
+        - low
+        - medium
+        - high
+    scheduleOption-Type:
+      type: string
+      enum:
+        - daily
+        - weekly
+    dayOfWeek-Type:
+      type: string
+      enum:
+        - Monday
+        - Tuesday
+        - Wednesday
+        - Thursday
+        - Friday
+        - Saturday
+        - Sunday
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerThresMonMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerThresMonMnS.yaml
new file mode 100644
index 0000000000..5bdb9c7fd2
--- /dev/null
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerThresMonMnS.yaml
@@ -0,0 +1,102 @@
+openapi: 3.0.1
+info:
+  title: TS 28.532 Performance Threshold Monitoring Service
+  version: 16.4.0
+  description: OAS 3.0.1 specification of the Performance Threshold Monitoring Service
+servers:
+  - url: 'http://{monitoringNotifTarget}'
+    variables:
+      monitoringNotifTarget:
+        description: >-
+          The open API server of the performance threshold monitoring service is
+          located in the consumer side, see monitoringNotifTarget attribute of
+          the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11].
+        default: example.com
+paths:
+  /notificationSink:
+    post:
+      summary: Send notifications about performance threshold crossing
+      description: To send a notifyThresholdCrossing notification
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/notifyThresholdCrossing-NotifType'
+      responses:
+        '204':
+          description: >-
+            Success case ("204 No Content"). The notification is successfully
+            delivered. The response message body is absent.
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-ResponseType'
+components:
+  schemas:
+    dateTime-Type:
+      type: string
+      format: date-Time
+    uri-Type:
+      type: string
+    long-Type:
+      type: string
+      format: long
+    thresholdLevel-Type:
+      type: integer
+    measurementTypeName-Type:
+      type: string
+    measurementValue-Type:
+      type: string
+    additionalText-Type:
+      type: string
+    error-ResponseType:
+      type: object
+      properties:
+        error:
+          type: object
+          properties:
+            errorInfo:
+              type: string
+    header-Type:
+      description: Header used in notifications as notification header
+      type: object
+      properties:
+        uri:
+          $ref: '#/components/schemas/uri-Type'
+        notificationId:
+          $ref: '#/components/schemas/notificationId-Type'
+        notificationType:
+          $ref: '#/components/schemas/notificationType-Type'
+        eventTime:
+          $ref: '#/components/schemas/dateTime-Type'
+    notificationId-Type:
+      $ref: '#/components/schemas/long-Type'
+    notificationType-Type:
+      type: string
+      enum:
+        - notifyThresholdCrossing
+    notifyThresholdCrossing-NotifType:
+      type: object
+      properties:
+        header:
+          $ref: '#/components/schemas/header-Type'
+        body:
+          type: object
+          properties:
+            startOfMonitoringGP:
+              $ref: '#/components/schemas/dateTime-Type'
+            endOfMonitoringGP:
+              $ref: '#/components/schemas/dateTime-Type'
+            monitoredObjectInstance:
+              $ref: '#/components/schemas/uri-Type'
+            thresholdLevel:
+              $ref: '#/components/schemas/thresholdLevel-Type'
+            measurementTypeName:
+              $ref: '#/components/schemas/measurementTypeName-Type'
+            measurementValue:
+              $ref: '#/components/schemas/measurementValue-Type'
+            additionalText:
+              $ref: '#/components/schemas/additionalText-Type'
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerfDataStreamingMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerfDataStreamingMnS.yaml
new file mode 100644
index 0000000000..e040e14c80
--- /dev/null
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/PerfDataStreamingMnS.yaml
@@ -0,0 +1,363 @@
+openapi: 3.0.1
+info:
+  title: TS 28.550 Performance Data Streaming Service
+  version: 16.3.0
+  description: OAS 3.0.1 specification of the Performance Data Streaming Service
+servers:
+  - url: 'http://{streamTarget}/PerfDataStreamMnS/v1630'
+    description: This URL is used for posting the set of information about streams supported on the connection between the producer and the consumer.
+    variables:
+      streamTarget:
+        description: 'The open API server of the performance data streaming service is located in the consumer side,and the “streamTarget” part corresponds to the streamTarget parameter provided in the createMeasurementJob operation (see clause 6.1.1.2) or the streamTarget attribute of the MOI of MeasurementControlor MeasurementReader, see 3GPP TS 28.622 [5]).'
+        default: example.com
+  - url: 'wss://{streamTarget}/PerfDataStreamMnS/v1630/streamingConnection'
+    description: This URL is used for establishing the WebSocket connection for the performance data streaming service.
+    variables:
+      streamTarget:
+        description: 'The open API server of the performance data streaming service is located in the consumer side,and the “streamTarget” part corresponds to the streamTarget parameter provided in the createMeasurementJob operation (see clause 6.1.1.2) or the streamTarget attribute of the MOI of MeasurementControlor MeasurementReader, see 3GPP TS 28.622 [5]).'
+        default: example.com
+paths:
+  /streamInfoList:
+    post:
+      summary: The set of information about the streams sent from the producer to the consumer
+      description: To send the streamInfoList from the producer to the consumer
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/streamInfoListPost-RequestType'
+      responses:
+        '201':
+          description: Success case ("201 Posted"). The streamInfoList is successfully posted.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/streamInfoListPost-ResponseType'
+        '202':
+          description: Partial success case ("202 Partially posted"). The representation of the posted resource on stream information.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/streamInfoListPost-ResponseType'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-ResponseType'
+    get:
+      summary: Read resources of stream information from the streaming consumer
+      description: 'With HTTP GET, resources of stream information are read. The resources to be read are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be returned.'
+      parameters:
+        - name: streamIdList
+          in: query
+          description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI.
+          required: true
+          schema:
+            type: array
+            items:
+              type: integer
+      responses:
+        '200':
+          description: 'Success case ("200 OK"). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.'
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType'
+        '202':
+          description: Partial success case ("202 Partially retrieved"). The representation of the retrieved resources on stream information.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-ResponseType'
+    patch:
+      summary: Update resources of stream information to the streaming consumer
+      description: 'With HTTP PATCH, resources of stream information are to be updated. The resources to be updated are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be updated.'
+      parameters:
+        - name: streamIdList
+          in: query
+          description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI.
+          required: true
+          schema:
+            type: array
+            items:
+              type: integer
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/listOfStreamInfoToUpdate-RequestType'
+      responses:
+        '200':
+          description: Success case ("200 OK"). The resources selected by the query parameter are updated and returned in the response message body.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/listOfStreamInfoUpdate-ResponseType'
+        '202':
+          description: Partial success case ("202 Partially updated"). The representation of the updated resources on stream information
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/listOfStreamInfoUpdate-ResponseType'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-ResponseType'
+    delete:
+      summary: The information of streams to be deleted by the producer to the consumer
+      description: 'With HTTP DELETE, resources of stream information are to be deleted. The resources to be deleted are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be deleted.'
+      parameters:
+        - name: streamIdList
+          in: query
+          description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI.
+          required: true
+          schema:
+            type: array
+            items:
+              type: integer
+      responses:
+        '204':
+          description: Success case ("204 No Content"). The stream information resource has been deleted. The response message body is absent.
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-ResponseType'
+  '/streamInfoList/{streamId}':
+    get:
+      summary: Read resource of the stream information from the streaming consumer
+      description: 'With HTTP GET, resource of stream information is read. The resource to be read is identified with the path component the URI.'
+      parameters:
+        - name: streamId
+          in: path
+          description: Identifies the stream for which the information is to be retrieved.
+          required: true
+          schema:
+            $ref: '#/components/schemas/uri-Type'
+      responses:
+        '200':
+          description: Success case ("200 OK"). The resource identified in the request for retrieval is returned in the response message body.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-ResponseType'
+    patch:
+      summary: Update the resource of stream information to the streaming consumer
+      description: 'With HTTP PATCH, resource of stream information is to be updated. The resource to be updated is identified by the path component of the URI. '
+      parameters:
+        - name: streamId
+          in: path
+          description: Identifies the stream for which the information is to be updated.
+          required: true
+          schema:
+            $ref: '#/components/schemas/uri-Type'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/streamInfoToUpdate-RequestType'
+      responses:
+        '200':
+          description: Success case ("200 OK"). The resources identified by the path of the URI is updated and returned in the response message body.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/streamInfoUpdate-ResponseType'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-ResponseType'
+    delete:
+      summary: The stream information to be deleted by the producer to the consumer
+      description: 'With HTTP DELETE, resource of stream information identified by the path component of the URI is to be deleted.'
+      parameters:
+        - name: streamId
+          in: path
+          description: Identifies the stream for which the information is to be deleted
+          required: true
+          schema:
+            $ref: '#/components/schemas/uri-Type'
+      responses:
+        '204':
+          description: Success case ("204 No Content"). The stream information resource has been deleted. The response message body is absent.
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-ResponseType'
+  /streamConnection:
+    get:
+      summary: The connection for streaming from the producer to the consumer
+      description: To establish the WebSocket connection between the producer and the consumer. The HTTP version of this operation shall not be earlier than HTTP/1.1
+      parameters:
+        - in: header
+          name: Upgrade
+          required: true
+          schema:
+            $ref: '#/components/schemas/Upgrade-HeaderType'
+        - in: header
+          name: Connection
+          required: true
+          schema:
+            $ref: '#/components/schemas/Connection-HeaderType'
+        - in: header
+          name: Sec-WebSocket-Key
+          required: true
+          schema:
+            $ref: '#/components/schemas/Sec-WebSocket-Key-HeaderType'
+        - in: header
+          name: Sec-WebSocket-Version
+          required: true
+          schema:
+            $ref: '#/components/schemas/Sec-WebSocket-Version-HeaderType'
+      responses:
+        '101':
+          description: Success case ("101 Switching Protocols "). The connection has been successfully switched to WebSocket. The response message body is absent.
+          headers:
+            Upgrade:
+              schema:
+                $ref: '#/components/schemas/Upgrade-HeaderType'
+            Connection:
+              schema:
+                $ref: '#/components/schemas/Connection-HeaderType'
+            Sec-WebSocket-Accept-HeaderType:
+              schema:
+                $ref: '#/components/schemas/Sec-WebSocket-Accept-HeaderType'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/error-ResponseType'
+components:
+  schemas:
+    uri-Type:
+      type: string
+    streamInfoIn-Type:
+      type: object
+      properties:
+        streamId:
+          type: integer
+        iOCInstance:
+          $ref: '#/components/schemas/uri-Type'
+        measTypes:
+          type: array
+          items:
+            type: string
+    streamInfoOut-Type:
+      type: object
+      properties:
+        streamId:
+          $ref: '#/components/schemas/uri-Type'
+        iOCInstance:
+          $ref: '#/components/schemas/uri-Type'
+        measTypes:
+          type: array
+          items:
+            type: string
+    error-ResponseType:
+      type: object
+      properties:
+        error:
+          type: object
+          properties:
+            errorInfo:
+              type: string
+    streamInfoListPost-RequestType:
+      type: object
+      properties:
+        streamInfoList:
+          type: array
+          items:
+            $ref: '#/components/schemas/streamInfoIn-Type'
+    streamInfoListPost-ResponseType:
+      type: object
+      properties:
+        streamInfoListPosted:
+          type: array
+          items:
+            $ref: '#/components/schemas/streamInfoOut-Type'
+    streamInfoRetrieval-ResponseType:
+      type: object
+      properties:
+        streamInfoOut:
+          $ref: '#/components/schemas/streamInfoOut-Type'
+    listOfStreamInfoRetrieval-ResponseType:
+      type: object
+      properties:
+        listOfStreamInfoOut:
+          type: array
+          items:
+            $ref: '#/components/schemas/streamInfoOut-Type'
+    streamInfoToUpdatePropertyType:
+      type: object
+      properties:
+        iOCInstance:
+          description: 'The updated measured object instance, empty value means no update.'
+          allOf:
+            - $ref: '#/components/schemas/uri-Type'
+        measTypes:
+          description: 'The updated list of measurement type, empty value means no update.'
+          type: array
+          items:
+            type: string
+    streamInfoToUpdate-RequestType:
+      type: object
+      properties:
+        streamInfoToUpdate:
+          $ref: '#/components/schemas/streamInfoToUpdatePropertyType'
+    listOfStreamInfoToUpdate-RequestType:
+      type: object
+      properties:
+        listOfStreamInfoToUpdate:
+          type: array
+          items:
+            $ref: '#/components/schemas/streamInfoToUpdatePropertyType'
+    streamInfoUpdate-ResponseType:
+      type: object
+      properties:
+        streamInfoUpdated:
+          $ref: '#/components/schemas/streamInfoOut-Type'
+    listOfStreamInfoUpdate-ResponseType:
+      type: object
+      properties:
+        listOfStreamInfoUpdated:
+          type: array
+          items:
+            $ref: '#/components/schemas/streamInfoOut-Type'
+    Upgrade-HeaderType:
+      type: string
+      enum:
+        - websocket
+    Connection-HeaderType:
+      type: string
+      enum:
+        - Upgrade
+    Sec-WebSocket-Key-HeaderType:
+      type: string
+    Sec-WebSocket-Version-HeaderType:
+      type: string
+    Sec-WebSocket-Accept-HeaderType:
+      type: string
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/comDefs.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/comDefs.yaml
new file mode 100644
index 0000000000..04ab651614
--- /dev/null
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/comDefs.yaml
@@ -0,0 +1,84 @@
+openapi: 3.0.1
+info:
+  title: Common Type Definitions
+  version: 16.3.0
+  description: >-
+    OAS 3.0.1 specification of common type definitions in the Generic NRM
+    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+externalDocs:
+  description: 3GPP TS 28.623 V16.3.0; Generic NRM, Common Type Definitions
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
+paths: {}
+components:
+  schemas:
+    Long:
+      type: string
+      format: long
+    Float:
+      type: string
+      format: float
+    DateTime:
+      type: string
+      format: date-Time
+    Dn:
+      type: string
+    Uri:
+      type: string
+    AttributeNameValuePairSet:
+      type: object
+      minProperties: 1
+    AttributeValueChangeSet:
+      description: >-
+        The key in this map is the attribute name. The value of each key is an array.
+        When only one item is present in the array, it carries the new attribute
+        value. If two items are present, then the first item carries the old value
+        and the second item the new value. The items can be of any type including null.
+      type: object
+      additionalProperties:
+        type: array
+        minItems: 1
+        maxItems: 2
+        items:
+          nullable: true
+    Filter:
+      type: string
+    SystemDN:
+      type: string
+    NotificationId:
+      type: integer
+    NotificationHeader:
+      description: >-
+        Header used for all notifications types
+      type: object
+      required:
+        - uri
+        - notificationId
+        - notificationType
+        - eventTime
+        - systemDn
+      properties:
+        uri:
+          $ref: '#/components/schemas/Uri'
+        notificationId:
+          $ref: '#/components/schemas/NotificationId'
+        notificationType:
+          oneOf:
+            - $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes'
+            #- $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes'
+            # more to be added
+        eventTime:
+          $ref: '#/components/schemas/DateTime'
+        systemDN:
+          $ref: '#/components/schemas/SystemDN'
+    ErrorResponse:
+      description: >-
+        Default schema for the response message body in case the request
+        is not successful.
+      type: object
+      properties:
+        error:
+          type: object
+          properties:
+            errorInfo:
+              type: string
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/coslaNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/coslaNrm.yaml
new file mode 100644
index 0000000000..48c85eca18
--- /dev/null
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/coslaNrm.yaml
@@ -0,0 +1,131 @@
+openapi: 3.0.3
+
+info:
+  title: coslaNrm
+  version: 16.4.0
+  description:
+    OAS 3.0.1 specification of the Cosla NRM
+    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+
+externalDocs:
+  description: 3GPP TS 28.536 V16.4.0; 5G NRM, Slice NRM
+  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.536/
+
+paths: {}
+
+components:
+
+  schemas:
+
+#------------ Type definitions ---------------------------------------------------
+
+    ControlLoopLifeCyclePhase:
+      anyOf:
+        - type: string
+          enum:
+            - PREPARATION
+            - COMMISSIONING
+            - OPERATION
+            - DECOMMISSIONING
+        - type: string
+
+    TimeUnit:
+      anyOf:
+        - type: string
+          enum:
+            - SECOND
+            - MINUTE
+            - HOUR
+            - DAY
+        - type: string
+
+    OperationalState:
+      anyOf:
+        - type: string
+          enum:
+            - ENABLED
+            - DISABLED
+        - type: string
+
+    AdministrativeState:
+      anyOf:
+        - type: string
+          enum:
+            - LOCKED
+            - SHUTTING_DOWN
+            - UNLOCKED
+        - type: string
+
+    ObservationTime:
+      type: integer
+
+    ObservationTimePeriod:
+      type: object
+
+    AssuranceControlLoopGoal:
+      type: object
+
+    AssuranceGoalStatus:
+      type: object
+
+    AssuranceGoalStatusObserved:
+      type: object
+
+    AssuranceGoalStatusPredicted:
+      type: object
+
+#-------- Definition of concrete IOCs --------------------------------------------
+
+    AssuranceControlLoop-Single:
+      allOf:
+        - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr'
+        - type: object
+          properties:
+            operationalState:
+              $ref: '#/components/schemas/OperationalState'
+            administrativeState:
+              $ref: '#/components/schemas/AdministrativeState'
+            controlLoopLifeCyclePhase:
+              $ref: '#/components/schemas/ControlLoopLifeCyclePhase'
+            observationTimePeriod:
+              allOf:
+                - $ref: '#/components/schemas/ObservationTimePeriod'
+                - type: object
+                  properties:
+                    observationTime:
+                      $ref: '#/components/schemas/ObservationTime'
+                    timeUnit:
+                      $ref: '#/components/schemas/TimeUnit'
+            AssuranceGoalStatus:
+              allOf:
+                - $ref: '#/components/schemas/AssuranceGoalStatus'
+                - type: object
+                  properties:
+                    assuranceGoalStatusObserved:
+                      $ref: '#/components/schemas/AssuranceGoalStatusObserved'
+                    assuranceGoalStatusPredicted:
+                      $ref: '#/components/schemas/AssuranceGoalStatusPredicted'
+            managedEntity-Multiple:
+              $ref: '#/components/schemas/ManagedEntity-Multiple'
+            assuranceControlLoopGoal:
+              $ref: '#/components/schemas/AssuranceControlLoopGoal'
+
+    ManagedEntity-Single:
+      oneOf:
+        - $ref: 'sliceNrm.yaml#/components/schemas/NetworkSlice'
+        - $ref: 'sliceNrm.yaml#/components/schemas/NetworkSliceSubnet'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-Attr'
+
+#-------- Definition of JSON arrays for name-contained IOCs ----------------------
+
+    AssuranceControlLoop-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/AssuranceControlLoop-Single'
+
+    ManagedEntity-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/ManagedEntity-Single'
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/faultMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/faultMnS.yaml
index 752ead6b1e..561f203bd0 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/faultMnS.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/faultMnS.yaml
@@ -1,21 +1,21 @@
 openapi: 3.0.1
 info:
   title: Fault Supervision MnS
-  version: 16.6.0
+  version: 16.4.0
   description: >-
     OAS 3.0.1 definition of the Fault Supervision MnS
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
-  description: 3GPP TS 28.532; Generic management services
+  description: 3GPP TS 28.532 V16.4.0; Generic management services
   url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/
 servers:
-  - url: '{MnSRoot}/FaultSupervisionMnS/{MnSversion}'
+  - url: '{MnSRoot}/FaultSupervisionMnS/{version}'
     variables:
       MnSRoot:
         description: See subclause 4.4.3 of TS 32.158
         default: http://example.com/3GPPManagement
-      MnSversion:
+      version:
         description: Version number of the OpenAPI definition
         default: XXX
 paths:
@@ -35,12 +35,12 @@ paths:
           in: query
           required: false
           schema:
-            $ref: 'comDefs.yaml#/components/schemas/Dn'
+            $ref: '#/components/schemas/Dn'
         - name: filter
           in: query
           required: false
           schema:
-            $ref: 'comDefs.yaml#/components/schemas/Filter'
+            $ref: '#/components/schemas/Filter'
       responses:
         '200':
           description: >-
@@ -57,7 +57,7 @@ paths:
                       - type: object
                         properties:
                           lastNotificationHeader:
-                            $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+                            $ref: '#/components/schemas/NotificationHeader'
                       - $ref: '#/components/schemas/AlarmRecord'
                       - type: object
                         properties:
@@ -68,7 +68,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                $ref: '#/components/schemas/ErrorResponse'
     patch:
       summary: 'Clear, acknowledge or unacknowledge multiple alarms'
       description: >-
@@ -130,7 +130,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                $ref: '#/components/schemas/ErrorResponse'
   /alarms/{alarmId}:
     patch:
       summary: 'Clear, acknowledge or unacknowledge a single alarm'
@@ -163,7 +163,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                $ref: '#/components/schemas/ErrorResponse'
   /alarms/{alarmId}/comments:
     post:
       summary: Add a comment to a single alarm
@@ -203,7 +203,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                $ref: '#/components/schemas/ErrorResponse'
 
   /subscriptions:
     post:
@@ -238,7 +238,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                $ref: '#/components/schemas/ErrorResponse'
       callbacks:
         notifyNewAlarm:
           '{request.body#/consumerReference}':
@@ -262,7 +262,7 @@ paths:
                   content:
                     application/json:
                       schema:
-                        $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                        $ref: '#/components/schemas/ErrorResponse'
         notifyClearedAlarm:
           '{request.body#/consumerReference}':
             post:
@@ -283,7 +283,7 @@ paths:
                   content:
                     application/json:
                       schema:
-                        $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                        $ref: '#/components/schemas/ErrorResponse'
         notifyChangedAlarm:
           '{request.body#/consumerReference}':
             post:
@@ -304,7 +304,7 @@ paths:
                   content:
                     application/json:
                       schema:
-                        $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                        $ref: '#/components/schemas/ErrorResponse'
         notifyChangedAlarmGeneral:
           '{request.body#/consumerReference}':
             post:
@@ -327,7 +327,7 @@ paths:
                   content:
                     application/json:
                       schema:
-                        $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                        $ref: '#/components/schemas/ErrorResponse'
         notifyCorrelatedNotificationChanged:
           '{request.body#/consumerReference}':
             post:
@@ -348,7 +348,7 @@ paths:
                   content:
                     application/json:
                       schema:
-                        $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                        $ref: '#/components/schemas/ErrorResponse'
         notifyAckStateChanged:
           '{request.body#/consumerReference}':
             post:
@@ -369,7 +369,7 @@ paths:
                   content:
                     application/json:
                       schema:
-                        $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                        $ref: '#/components/schemas/ErrorResponse'
         notifyComments:
           '{request.body#/consumerReference}':
             post:
@@ -390,7 +390,7 @@ paths:
                   content:
                     application/json:
                       schema:
-                        $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                        $ref: '#/components/schemas/ErrorResponse'
         notifyPotentialFaultyAlarmList:
           '{request.body#/consumerReference}':
             post:
@@ -411,7 +411,7 @@ paths:
                   content:
                     application/json:
                       schema:
-                        $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                        $ref: '#/components/schemas/ErrorResponse'
         notifyAlarmListRebuilt:
           '{request.body#/consumerReference}':
             post:
@@ -432,7 +432,7 @@ paths:
                   content:
                     application/json:
                       schema:
-                        $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                        $ref: '#/components/schemas/ErrorResponse'
   /subscriptions/{subscriptionId}:
     delete:
       summary: Delete a subscription
@@ -458,13 +458,94 @@ paths:
           content:
             application/json:
               schema:
-                $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                $ref: '#/components/schemas/ErrorResponse'
 
 components:
   schemas:
 
-  #---- Definition of AlarmRecord ----------------------------------------------------#
+  #---- Definitions to be moved to comDefs.yaml --------------------------------------#
+
+    Long:
+      type: string
+      format: long
+    Float:
+      type: string
+      format: float
+    DateTime:
+      type: string
+      format: date-Time
+
+    Dn:
+      type: string
+    Uri:
+      type: string
+
+    AttributeNameValuePairSet:
+      type: object
+      minProperties: 1
+    AttributeValueChangeSet:
+      description: >-
+        The key in this map is the attribute name. The value of each key is an array.
+        When only one item is present in the array, it carries the new attribute
+        value. If two items are present, then the first item carries the old value
+        and the second item the new value. The items can be of any type including null.
+      type: object
+      additionalProperties:
+        type: array
+        minItems: 1
+        maxItems: 2
+        items:
+          nullable: true
+
+    Filter:
+      type: string
+    SystemDN:
+      type: string
+
+    NotificationId:
+      type: integer
+    NotificationHeader:
+      description: >-
+        Header used for all notification types
+      type: object
+      required:
+        - href
+        - notificationId
+        - notificationType
+        - eventTime
+        - systemDN
+      properties:
+        uri:
+          $ref: '#/components/schemas/Uri'
+        notificationId:
+          $ref: '#/components/schemas/NotificationId'
+        notificationType:
+          oneOf:
+            - $ref: '#/components/schemas/AlarmNotificationTypes'
+            #- $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes'
+            #- $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes'
+            # more to be added
+        eventTime:
+          $ref: '#/components/schemas/DateTime'
+        systemDN:
+          $ref: '#/components/schemas/SystemDN'
+
+    ErrorResponse:
+      description: >-
+        Default schema for the response message body in case the request is not
+        successful.
+      type: object
+      properties:
+        error:
+          type: object
+          properties:
+            errorInfo:
+              type: string
+
+  #---- End of definitions to be moved to comDefs.yaml -------------------------------#
 
+  #---- Definition of AlarmRecord ----------------------------------------------------#
+ 
     AlarmId:
       type: string
     AlarmType:
@@ -527,47 +608,46 @@ components:
         high:
           oneOf:
             - type: integer
-            - $ref: 'comDefs.yaml#/components/schemas/Float'
+            - $ref: '#/components/schemas/Float'
         low:
-          $ref: 'comDefs.yaml#/components/schemas/Float'
+          $ref: '#/components/schemas/Float'
     ThresholdLevelInd:
-      oneOf:
-        - type: object
-          properties:
-            up:
-              $ref: '#/components/schemas/ThresholdHysteresis'
-        - type: object
-          properties:
-            down:
-              $ref: '#/components/schemas/ThresholdHysteresis'
+      type: object
+      required:
+        - up
+      properties:
+        up:
+          $ref: '#/components/schemas/ThresholdHysteresis'
+        low:
+          $ref: '#/components/schemas/ThresholdHysteresis'
     ThresholdInfo:
       type: object
+      required:
+        - observedMeasurement
+        - observedValue
       properties:
         observedMeasurement:
           type: string
         observedValue:
           oneOf:
             - type: integer
-            - $ref: 'comDefs.yaml#/components/schemas/Float'
-        thresholdLevel:
+            - $ref: '#/components/schemas/Float'
+        thresholdLevelInd:
           $ref: '#/components/schemas/ThresholdLevelInd'
         armTime:
-          $ref: 'comDefs.yaml#/components/schemas/DateTime'
-      required:
-        - observedMeasurement
-        - observedValue
+          $ref: '#/components/schemas/DateTime'
     CorrelatedNotification:
       type: object
+      required:
+        - source
+        - notificationId
       properties:
         sourceObjectInstance:
-          $ref: 'comDefs.yaml#/components/schemas/Dn'
+          $ref: '#/components/schemas/Dn'
         notificationIds:
           type: array
           items:
-            $ref: 'comDefs.yaml#/components/schemas/NotificationId'
-      required:
-        - sourceObjectInstance
-        - notificationIds
+            $ref: '#/components/schemas/NotificationId'
     CorrelatedNotifications:
       type: array
       items:
@@ -587,15 +667,15 @@ components:
         # alarmId:
         #  $ref: '#/components/schemas/AlarmId'
         objectInstance:
-          $ref: 'comDefs.yaml#/components/schemas/Dn'
+          $ref: '#/components/schemas/Dn'
         notificationId:
-          $ref: 'comDefs.yaml#/components/schemas/NotificationId'
+          $ref: '#/components/schemas/NotificationId'
         alarmRaisedTime:
-          $ref: 'comDefs.yaml#/components/schemas/DateTime'
+          $ref: '#/components/schemas/DateTime'
         alarmChangedTime:
-          $ref: 'comDefs.yaml#/components/schemas/DateTime'
+          $ref: '#/components/schemas/DateTime'
         alarmClearedTime:
-          $ref: 'comDefs.yaml#/components/schemas/DateTime'
+          $ref: '#/components/schemas/DateTime'
         alarmType:
           $ref: '#/components/schemas/AlarmType'
         probableCause:
@@ -607,7 +687,7 @@ components:
         backedUpStatus:
           type: boolean
         backUpObject:
-          $ref: 'comDefs.yaml#/components/schemas/Dn'
+          $ref: '#/components/schemas/Dn'
         trendIndication:
           $ref: '#/components/schemas/TrendIndication'
         thresholdinfo:
@@ -615,21 +695,21 @@ components:
         correlatedNotifications:
           $ref: '#/components/schemas/CorrelatedNotifications'
         stateChangeDefinition:
-          $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet'
+          $ref: '#/components/schemas/AttributeValueChangeSet'
         monitoredAttributes:
-          $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+          $ref: '#/components/schemas/AttributeNameValuePairSet'
         proposedRepairActions:
           type: string
         additionalText:
           type: string
         additionalInformation:
-          $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+          $ref: '#/components/schemas/AttributeNameValuePairSet'
 
         rootCauseIndicator:
           type: boolean
 
         ackTime:
-          $ref: 'comDefs.yaml#/components/schemas/DateTime'
+          $ref: '#/components/schemas/DateTime'
         ackUserId:
           type: string
         ackSystemId:
@@ -649,7 +729,7 @@ components:
           type: string
 
   #---- Definition of alarm notifications --------------------------------------------#
-
+  
     AlarmNotificationTypes:
       type: string
       enum:
@@ -670,7 +750,7 @@ components:
 
     NotifyNewAlarm:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/NotificationHeader'
         - type: object
           required:
             - alarmId
@@ -691,7 +771,7 @@ components:
             backedUpStatus:
               type: boolean
             backUpObject:
-              $ref: 'comDefs.yaml#/components/schemas/Dn'
+              $ref: '#/components/schemas/Dn'
             trendIndication:
               $ref: '#/components/schemas/TrendIndication'
             thresholdInfo:
@@ -699,20 +779,20 @@ components:
             correlatedNotifications:
               $ref: '#/components/schemas/CorrelatedNotifications'
             stateChangeDefinition:
-              $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet'
+              $ref: '#/components/schemas/AttributeValueChangeSet'
             monitoredAttributes:
-              $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+              $ref: '#/components/schemas/AttributeNameValuePairSet'
             proposedRepairActions:
               type: string
             additionalText:
               type: string
             additionalInformation:
-              $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+              $ref: '#/components/schemas/AttributeNameValuePairSet'
             rootCauseIndicator:
               type: boolean
     NotifyNewSecAlarm:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/NotificationHeader'
         - type: object
           required:
             - alarmId
@@ -721,7 +801,7 @@ components:
             - perceivedSeverity
             - serviceUser
             - serviceProvider
-            - securityAlarmDetector
+            - securityAlarmDetector 
           properties:
             alarmId:
               $ref: '#/components/schemas/AlarmId'
@@ -736,7 +816,7 @@ components:
             additionalText:
               type: string
             additionalInformation:
-              $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+              $ref: '#/components/schemas/AttributeNameValuePairSet'
             rootCauseIndicator:
               type: boolean
             serviceUser:
@@ -747,7 +827,7 @@ components:
               type: string
     NotifyClearedAlarm:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/NotificationHeader'
         - type: object
           required:
             - alarmId
@@ -771,7 +851,7 @@ components:
               type: string
     NotifyChangedAlarm:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/NotificationHeader'
         - type: object
           required:
             - alarmId
@@ -789,11 +869,14 @@ components:
               $ref: '#/components/schemas/PerceivedSeverity'
     NotifyChangedAlarmGeneral:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/NotificationHeader'
         - type: object
           required:
             - alarmId
             - alarmType
+            - probableCause
+            - perceivedSeverity
+            - changedAlarmAttributes
           properties:
             alarmId:
               $ref: '#/components/schemas/AlarmId'
@@ -810,35 +893,38 @@ components:
             backedUpStatus:
               type: boolean
             backUpObject:
-              $ref: 'comDefs.yaml#/components/schemas/Dn'
+              $ref: '#/components/schemas/Dn'
             trendIndication:
               $ref: '#/components/schemas/TrendIndication'
             thresholdInfo:
               $ref: '#/components/schemas/ThresholdInfo'
             stateChangeDefinition:
-              $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet'
+              $ref: '#/components/schemas/AttributeValueChangeSet'
             monitoredAttributes:
-              $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+              $ref: '#/components/schemas/AttributeNameValuePairSet'
             proposedRepairActions:
               type: string
             additionalText:
               type: string
             additionalInformation:
-              $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+              $ref: '#/components/schemas/AttributeNameValuePairSet'
             rootCauseIndicator:
               type: boolean
             changedAlarmAttributes:
-              $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+              $ref: '#/components/schemas/AttributeNameValuePairSet'
     NotifyChangedSecAlarmGeneral:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/NotificationHeader'
         - type: object
           required:
             - alarmId
             - alarmType
+            - probableCause
+            - perceivedSeverity
             - serviceUser
             - serviceProvider
             - securityAlarmDetector
+            - changedAlarmAttributes
           properties:
             alarmId:
               $ref: '#/components/schemas/AlarmId'
@@ -853,7 +939,7 @@ components:
             additionalText:
               type: string
             additionalInformation:
-              $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+              $ref: '#/components/schemas/AttributeNameValuePairSet'
             rootCauseIndicator:
               type: boolean
             serviceUser:
@@ -863,10 +949,10 @@ components:
             securityAlarmDetector:
               type: string
             changedAlarmAttributes:
-              $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
+              $ref: '#/components/schemas/AttributeNameValuePairSet'
     NotifyCorrelatedNotificationChanged:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/NotificationHeader'
         - type: object
           required:
             - alarmId
@@ -880,7 +966,7 @@ components:
               type: boolean
     NotifyAckStateChanged:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/NotificationHeader'
         - type: object
           required:
             - alarmId
@@ -906,7 +992,7 @@ components:
               type: string
     NotifyComments:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/NotificationHeader'
         - type: object
           required:
             - alarmId
@@ -927,7 +1013,7 @@ components:
               $ref: '#/components/schemas/Comments'
     NotifyPotentialFaultyAlarmList:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/NotificationHeader'
         - type: object
           required:
             - reason
@@ -936,7 +1022,7 @@ components:
               type: string
     NotifyAlarmListRebuilt:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/NotificationHeader'
         - type: object
           required:
             - reason
@@ -947,7 +1033,7 @@ components:
               $ref: '#/components/schemas/AlarmListAlignmentRequirement'
 
   #---- Definition of query parameters -----------------------------------------------#
-
+  
     AlarmAckState:
       type: string
       enum:
@@ -1033,7 +1119,7 @@ components:
       type: object
       properties:
         commentTime:
-          $ref: 'comDefs.yaml#/components/schemas/DateTime'
+          $ref: '#/components/schemas/DateTime'
         commentUserId:
           type: string
         commentSystemId:
@@ -1051,8 +1137,8 @@ components:
       type: object
       properties:
         consumerReference:
-          $ref: 'comDefs.yaml#/components/schemas/Uri'
+          $ref: '#/components/schemas/Uri'
         timeTick:
-          type: integer
+          $ref: '#/components/schemas/Long'
         filter:
-          $ref: 'comDefs.yaml#/components/schemas/Filter'
+          $ref: '#/components/schemas/Filter'
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/genericNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/genericNrm.yaml
index 7e7576c90f..070ad09dc0 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/genericNrm.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/genericNrm.yaml
@@ -1,13 +1,13 @@
 openapi: 3.0.1
 info:
   title: Generic NRM
-  version: 16.6.0
+  version: 16.4.0
   description: >-
-    OAS 3.0.1 definition of the Generic NRM
+    OAS 3.0.1 specification of the Generic NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
-  description: 3GPP TS 28.623 V16.5.0; Generic NRM
+  description: 3GPP TS 28.623 V16.4.0; Generic NRM
   url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
 paths: {}
 components:
@@ -15,11 +15,53 @@ components:
 
 #-------- Definition of types-----------------------------------------------------
 
+    DateTime:
+      type: string
+      format: date-time
+    Dn:
+      type: string
+      maxLength: 400
+    DnList:
+      type: array
+      items:
+        $ref: '#/components/schemas/Dn'
+    Mcc:
+      type: string
+      pattern: '^[0-9]{3}$'
+    Mnc:
+      type: string
+      pattern: '^[0-9]{2,3}$'
+    AdministrativeState:
+      type: string
+      enum:
+        - LOCKED
+        - UNLOCKED
+    OperationalState:
+      type: string
+      enum:
+        - ENABLED
+        - DISABLED
+    UsageState:
+      type: string
+      enum:
+        - IDEL
+        - ACTIVE
+        - BUSY
     RegistrationState:
       type: string
       enum:
         - REGISTERED
         - DEREGISTERED
+    SetOfMcc:
+      type: array
+      items:
+        $ref: '#/components/schemas/Mcc'
+    ManagedElementType:
+      type: string
+    ManagedElementTypeList:
+      type: array
+      items:
+        $ref: '#/components/schemas/ManagedElementType'
     VnfParameter:
       type: object
       properties:
@@ -31,6 +73,10 @@ components:
           type: string
         autoScalable:
           type: boolean
+    VnfParametersList:
+      type: array
+      items:
+        $ref: '#/components/schemas/VnfParameter'
     SiteLatitude:
       type: number
       format: float
@@ -58,26 +104,44 @@ components:
           type: string
         powerInterface:
           type: string
+    PeeParametersList:
+      type: array
+      items:
+        $ref: '#/components/schemas/PeeParameter'
+    MonitoringGPList:
+      type: array
+      items:
+        type: integer
+    ThresholdInfoList:
+      type: array
+      items:
+        $ref: '#/components/schemas/ThresholdInfo'
     ThresholdInfo:
       type: object
       properties:
-        thresholdDirection:
+        measurementType:
           type: string
-          enum:
-            - UP
-            - DOWN
-            - UP_AND_DOWN
+        direction:
+          $ref: '#/components/schemas/Direction'
+        thresholdPack:
+          $ref: '#/components/schemas/ThresholdPack'
+    Direction:
+      enum:
+        - Increasing
+        - Decreasing
+    ThresholdPack:
+      type: array
+      items:
+        $ref: '#/components/schemas/ThresholdPackElement'
+    ThresholdPackElement:
+      type: object
+      properties:
+        thresholdLevel:
+          type: integer
         thresholdValue:
-          oneOf:
-            - type: integer
-            - $ref: 'comDefs.yaml#/components/schemas/Float'
+          type: number
         hysteresis:
-          oneOf:
-            - type: integer
-              minimum: 0
-            - type: number
-              format: float
-              minimum: 0
+          type: number
     Operation:
       type: object
       properties:
@@ -87,6 +151,10 @@ components:
           $ref: '#/components/schemas/NFType'
         operationSemantics:
           $ref: '#/components/schemas/OperationSemantics'
+    OperationList:
+      type: array
+      items:
+        $ref: '#/components/schemas/Operation'
     NFType:
       type: string
       description: ' NF name defined in TS 23.501'
@@ -143,18 +211,32 @@ components:
       type: string
       pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$'
       example: '198.51.100.1'
+    Ipv4AddrRm:
+      type: string
+      pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$'
+      example: '198.51.100.1'
+      nullable: true
     Ipv6Addr:
       type: string
       allOf:
         - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$'
         - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$'
       example: '2001:db8:85a3::8a2e:370:7334'
+    Ipv6AddrRm:
+      type: string
+      allOf:
+        - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$'
+        - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$'
+      example: '2001:db8:85a3::8a2e:370:7334'
+      nullable: true
     Ipv6Prefix:
       type: string
       allOf:
         - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$'
         - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$'
       example: '2001:db8:abcd:12::0/64'
+    Uri:
+      type: string
     TransportProtocol:
       anyOf:
         - type: string
@@ -178,14 +260,9 @@ components:
           items:
             type: string
             enum:
-             - FILE_BASED_LOC_SET_BY_PRODUCER
-             - FILE_BASED_LOC_SET_BY_CONSUMER
-             - STREAM_BASED
-        monitorGranularityPeriods:
-          type: array
-          items:
-            type: integer
-            minimum: 1
+              - FILE_BASED_LOC_SET_BY_PRODUCER
+              - FILE_BASED_LOC_SET_BY_CONSUMER
+              - STREAM_BASED	
     ReportingCtrl:
       oneOf:
         - type: object
@@ -197,11 +274,11 @@ components:
             fileReportingPeriod:
               type: integer
             fileLocation:
-              $ref: 'comDefs.yaml#/components/schemas/Uri'
+              $ref: '#/components/schemas/Uri'
         - type: object
           properties:
             streamTarget:
-              $ref: 'comDefs.yaml#/components/schemas/Uri'
+              $ref: '#/components/schemas/Uri'
     Scope:
       type: object
       properties:
@@ -214,9 +291,31 @@ components:
             - BASE_SUBTREE
         scopeLevel:
           type: integer
+    NotificationType:
+      type: string
+      enum:
+        - notifyMOICreation
+        - notifyMOIDeletion
+        - notifyMOIAttributeValueChanges
+        - notifyEvent
+        - notifyNewAlarm
+        - notifyChangedAlarm
+        - notifyAckStateChanged
+        - notifyComments
+        - notifyCorrelatedNotificationChanged
+        - notifyChangedAlarmGeneral
+        - notifyAlarmListRebuilt
+        - notifyPotentialFaultyAlarmList
+        - notifyFileReady
+        - notifyFilePreparationError
+        - notifyThresholdCrossing
+    NotificationTypes:
+      type: array
+      items:
+        $ref: '#/components/schemas/NotificationType'
 
 #-------- Definition of types used in Trace control NRM fragment------------------
-
+                
     tjJobType-Type:
       type: string
       description: Specifies whether the TraceJob represents only MDT, Logged MBSFN MDT, Trace or a combined Trace and MDT job. Applicable for Trace, MDT, RCEF and RLF reporting. See 3GPP TS 32.422 clause 5.9a for additional details.
@@ -583,9 +682,9 @@ components:
       description: The PLMN for which sessions shall be selected in the Trace Session in case of management based activation when several PLMNs are supported in the RAN (this means that shared cells and not shared cells are allowed for the specified PLMN. Note that the PLMN Target might differ from the PLMN specified in the Trace Reference, as that specifies the PLMN that is containing the management system requesting the Trace Session from the NE. See 3GPP TS 32.422 clause 5.9b for additional details.
       properties:
         mcc:
-          $ref: 'comDefs.yaml#/components/schemas/Mcc'
+          $ref: '#/components/schemas/Mcc'
         mnc:
-          $ref: 'comDefs.yaml#/components/schemas/Mnc'
+          $ref: '#/components/schemas/Mnc'
       required:
         - mcc
         - mnc
@@ -617,9 +716,9 @@ components:
       description: The Trace Reference parameter shall be globally unique, therefore the Trace Reference shall compose as follows - MCC+MNC+Trace ID, where the MCC and MNC are coming with the Trace activation request from the management system to identify one PLMN containing the management system, and Trace ID is a 3 byte Octet String. See 3GPP TS 32.422 clause 5.6 for additional details.
       properties:
         mcc:
-          $ref: 'comDefs.yaml#/components/schemas/Mcc'
+          $ref: '#/components/schemas/Mcc'
         mnc:
-          $ref: 'comDefs.yaml#/components/schemas/Mnc'
+          $ref: '#/components/schemas/Mnc'
         traceId:
           type: integer
       required:
@@ -635,28 +734,19 @@ components:
         - STREAMING
 
     tjTraceTarget-Type:
-      type: object
-      description: Trace target conveying both the type and value of the target ID. For additional details see 3GPP TS 32.422
-      properties:
-        TargetIdType:
-          type: string
-          enum:
-            - IMSI
-            - IMEI
-            - IMEISV
-            - PUBLIC_ID
-            - UTRAN_CELL
-            - E-UTRAN_CELL
-            - NG-RAN_CELL
-            - eNB
-            - RNC
-            - gNB
-            - SUPI
-        TargetIdValue:
-          type: string
-      required:
-        - TargetIdType
-        - TargetIdValue
+      type: string
+      description: Type of trace target. For additional details see 3GPP TS 32.422.
+      enum:
+        - IMSI
+        - IMEI
+        - IMEISV
+        - PUBLIC_ID
+        - UTRAN_CELL
+        - E-UTRAN_CELL
+        - NG-RAN_CELL
+        - eNB
+        - RNC
+        - gNB
 
     tjTriggeringEvent-Type:
       type: object
@@ -682,14 +772,14 @@ components:
       required:
         - NetworkElement
         - EventBitmap
-
+    
     tjMDTAnonymizationOfData-Type:
       description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12.
       type: string
       enum:
         - NO_IDENTITY
         - TAC_OF_IMEI
-
+    
     tjMDTAreaConfigurationForNeighCell-Type:
       description: Used for logged NR MDT and defines the area for which UE is requested to perform measurement logging for neighbour cells which have list of frequencies. For additional details see 3GPP TS 32.422 clause 5.10.26.
       type: array
@@ -700,12 +790,12 @@ components:
             type: string
           cell:
             type: string
-
+      
     tjMDTAreaScope-Type:
       description: defines the area in terms or Cells or Tracking Area/Routing Area/Location Area where the MDT data collection shall take place. For additional details see 3GPP TS 32.422 clause 5.10.2.
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/DnList'
-
+        - $ref: '#/components/schemas/DnList'
+        
     tjMDTCollectionPeriodRrmLte-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.20.
       type: string
@@ -737,18 +827,7 @@ components:
         - 5120ms
         - 10240ms
         - 1min
-
-    tjMDTCollectionPeriodRrmNR-Type:
-      description: See details in 3GPP TS 32.422 clause 5.10.30.
-      type: string
-      enum:
-        - 1024ms
-        - 1280ms
-        - 2048ms
-        - 5120ms
-        - 10240ms
-        - 60000ms
-
+    
     tjMDTEventListForTriggeredMeasurement-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.28.
       type: string
@@ -764,7 +843,7 @@ components:
           type: integer
           minimum: 0
           maximum: 97
-        EventThresholdRSRQ:
+        EventThresholdRSRQ:      
           type: integer
           minimum: 0
           maximum: 34
@@ -846,7 +925,7 @@ components:
         - 3600s
         - 5400s
         - 7200s
-
+    
     tjMDTLoggingInterval-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.8.
       type: string
@@ -923,9 +1002,9 @@ components:
         type: object
         properties:
           mcc:
-            $ref: 'comDefs.yaml#/components/schemas/Mcc'
+            $ref: '#/components/schemas/Mcc'
           mnc:
-            $ref: 'comDefs.yaml#/components/schemas/Mnc'
+            $ref: '#/components/schemas/Mnc'
         required:
           - mcc
           - mnc
@@ -1025,9 +1104,9 @@ components:
           type: object
           properties:
             mcc:
-              $ref: 'comDefs.yaml#/components/schemas/Mcc'
+              $ref: '#/components/schemas/Mcc'
             mnc:
-              $ref: 'comDefs.yaml#/components/schemas/Mnc'
+              $ref: '#/components/schemas/Mnc'
           required:
             - mcc
             - mnc
@@ -1075,9 +1154,7 @@ components:
         userDefinedNetworkType:
           type: string
         setOfMcc:
-          type: array
-          items:
-            $ref: 'comDefs.yaml#/components/schemas/Mcc'
+          $ref: '#/components/schemas/SetOfMcc'
         priorityLabel:
           type: integer
         supportedPerfMetricGroups:
@@ -1090,15 +1167,13 @@ components:
         dnPrefix:
           type: string
         managedElementTypeList:
-          type: array
-          items:
-            type: string
+          $ref: '#/components/schemas/ManagedElementTypeList'
         userLabel:
           type: string
         locationName:
           type: string
         managedBy:
-          $ref: 'comDefs.yaml#/components/schemas/DnList'
+          $ref: '#/components/schemas/DnList'
         vendorName:
           type: string
         userDefinedState:
@@ -1123,6 +1198,8 @@ components:
           $ref: '#/components/schemas/PerfMetricJob-Multiple'
         ThresholdMonitor:
           $ref: '#/components/schemas/ThresholdMonitor-Multiple'
+        ThresholdMonitoringCapability:
+          $ref: '#/components/schemas/ThresholdMonitoringCapability-Single'
         NtfSubscriptionControl:
           $ref: '#/components/schemas/NtfSubscriptionControl-Multiple'
         TraceJob:
@@ -1136,6 +1213,8 @@ components:
           $ref: '#/components/schemas/PerfMetricJob-Multiple'
         ThresholdMonitor:
           $ref: '#/components/schemas/ThresholdMonitor-Multiple'
+        ThresholdMonitoringCapability:
+          $ref: '#/components/schemas/ThresholdMonitoringCapability-Single'
         NtfSubscriptionControl:
           $ref: '#/components/schemas/NtfSubscriptionControl-Multiple'
         TraceJob:
@@ -1151,13 +1230,9 @@ components:
         userLabel:
           type: string
         vnfParametersList:
-          type: array
-          items:
-            $ref: '#/components/schemas/VnfParameter'
+          $ref: '#/components/schemas/VnfParametersList'
         peeParametersList:
-          type: array
-          items:
-            $ref: '#/components/schemas/PeeParameter'
+          $ref: '#/components/schemas/PeeParametersList'
         priorityLabel:
           type: integer
         supportedPerfMetricGroups:
@@ -1183,7 +1258,7 @@ components:
         tjJobType:
           $ref: '#/components/schemas/tjJobType-Type'
         tjListOfInterfaces:
-          $ref: '#/components/schemas/tjListOfInterfaces-Type'
+          $ref: '#/components/schemas/tjListOfInterfaces-Type'                  
         tjListOfNeTypes:
           $ref: '#/components/schemas/tjListOfNeTypes-Type'
         tjPLMNTarget:
@@ -1212,8 +1287,6 @@ components:
           $ref: '#/components/schemas/tjMDTCollectionPeriodRrmLte-Type'
         tjMDTCollectionPeriodRrmUmts:
           $ref: '#/components/schemas/tjMDTCollectionPeriodRrmUmts-Type'
-        tjMDTCollectionPeriodRrmNR:
-          $ref: '#/components/schemas/tjMDTCollectionPeriodRrmNR-Type'
         tjMDTEventListForTriggeredMeasurement:
           $ref: '#/components/schemas/tjMDTEventListForTriggeredMeasurement-Type'
         tjMDTEventThreshold:
@@ -1258,10 +1331,12 @@ components:
     ManagedFunction-ncO:
       type: object
       properties:
-        PerfMetricJob:
-          $ref: '#/components/schemas/PerfMetricJob-Multiple'
+        MeasurementControl:
+          $ref: '#/components/schemas/MeasurementControl-Multiple'
         ThresholdMonitor:
           $ref: '#/components/schemas/ThresholdMonitor-Multiple'
+        ThresholdMonitoringCapability:
+          $ref: '#/components/schemas/ThresholdMonitoringCapability-Single'
         ManagedNFService:
           $ref: '#/components/schemas/ManagedNFService-Multiple'
         TraceJob:
@@ -1287,7 +1362,7 @@ components:
           $ref: '#/components/schemas/VsDataContainer-Multiple'
     ManagedNFService-Single:
       allOf:
-        - $ref: '#/components/schemas/Top'
+        - $ref: '#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1300,20 +1375,18 @@ components:
                 sAP:
                   $ref: '#/components/schemas/SAP'
                 operations:
-                  type: array
-                  items:
-                    $ref: '#/components/schemas/Operation'
+                  $ref: '#/components/schemas/OperationList'
                 administrativeState:
-                  $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
+                  $ref: '#/components/schemas/AdministrativeState'
                 operationalState:
-                  $ref: 'comDefs.yaml#/components/schemas/OperationalState'
+                  $ref: '#/components/schemas/OperationalState'
                 usageState:
-                  $ref: 'comDefs.yaml#/components/schemas/UsageState'
+                  $ref: '#/components/schemas/UsageState'
                 registrationState:
                   $ref: '#/components/schemas/RegistrationState'
     ManagementNode-Single:
       allOf:
-        - $ref: '#/components/schemas/Top'
+        - $ref: '#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1322,7 +1395,7 @@ components:
                 userLabel:
                   type: string
                 managedElements:
-                  $ref: 'comDefs.yaml#/components/schemas/DnList'
+                  $ref: '#/components/schemas/DnList'
                 vendorName:
                   type: string
                 userDefinedState:
@@ -1333,7 +1406,7 @@ components:
                   type: string
     MeContext-Single:
       allOf:
-        - $ref: '#/components/schemas/Top'
+        - $ref: '#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1343,17 +1416,17 @@ components:
                   type: string
     PerfMetricJob-Single:
       allOf:
-        - $ref: '#/components/schemas/Top'
+        - $ref: '#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               type: object
               properties:
                 administrativeState:
-                  $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
+                  $ref: '#/components/schemas/AdministrativeState'
                 operationalState:
-                  $ref: 'comDefs.yaml#/components/schemas/OperationalState'
-                jobId:
+                  $ref: '#/components/schemas/OperationalState'
+                perfMetricJobGroupId:
                   type: string
                 performanceMetrics:
                   type: array
@@ -1363,52 +1436,51 @@ components:
                   type: integer
                   minimum: 1
                 objectInstances:
-                  $ref: 'comDefs.yaml#/components/schemas/DnList'
+                  $ref: '#/components/schemas/DnList'
                 rootObjectInstances:
-                  $ref: 'comDefs.yaml#/components/schemas/DnList'
+                  $ref: '#/components/schemas/DnList'
                 reportingCtrl:
                   $ref: '#/components/schemas/ReportingCtrl'
+    ThresholdMonitoringCapability-Single:
+      allOf:
+        - $ref: '#/components/schemas/Top-Attr'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                supportedMonitoringGPs:
+                  $ref: '#/components/schemas/MonitoringGPList'
     ThresholdMonitor-Single:
       allOf:
-        - $ref: '#/components/schemas/Top'
+        - $ref: '#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               type: object
               properties:
-                administrativeState:
-                  $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
-                operationalState:
-                  $ref: 'comDefs.yaml#/components/schemas/OperationalState'
-                performanceMetrics:
-                  type: array
-                  items:
-                    type: string
                 thresholdInfoList:
-                  type: array
-                  items:
-                    $ref: '#/components/schemas/ThresholdInfo'
-                monitorGranularityPeriod:
+                  $ref: '#/components/schemas/ThresholdInfoList'
+                monitoringGP:
                   type: integer
-                  minimum: 1
-                objectInstances:
-                  $ref: 'comDefs.yaml#/components/schemas/DnList'
-                rootObjectInstances:
-                  $ref: 'comDefs.yaml#/components/schemas/DnList'
+                monitoringNotifTarget:
+                  type: string
+                monitoredIOCName:
+                  type: string
+                monitoredObjectDNs:
+                  $ref: '#/components/schemas/DnList'
     NtfSubscriptionControl-Single:
       allOf:
-        - $ref: '#/components/schemas/Top'
+        - $ref: '#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               type: object
               properties:
                 notificationRecipientAddress:
-                  $ref: 'comDefs.yaml#/components/schemas/Uri'
+                  $ref: '#/components/schemas/Uri'
                 notificationTypes:
-                  type: array
-                  items:
-                    $ref: 'comDefs.yaml#/components/schemas/NotificationType'
+                  $ref: '#/components/schemas/NotificationTypes'
                 scope:
                   $ref: '#/components/schemas/Scope'
                 notificationFilter:
@@ -1417,7 +1489,7 @@ components:
               $ref: '#/components/schemas/HeartbeatControl-Single'
     HeartbeatControl-Single:
       allOf:
-        - $ref: '#/components/schemas/Top'
+        - $ref: '#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1429,7 +1501,7 @@ components:
                   type: boolean
     TraceJob-Single:
       allOf:
-        - $ref: '#/components/schemas/Top'
+        - $ref: '#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1437,29 +1509,29 @@ components:
 
     AlarmList-Single:
       allOf:
-        - $ref: '#/components/schemas/Top'
+        - $ref: '#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               type: object
               properties:
                 administrativeState:
-                  $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
+                  $ref: '#/components/schemas/AdministrativeState'
                 operationalState:
-                  $ref: 'comDefs.yaml#/components/schemas/OperationalState'
+                  $ref: '#/components/schemas/OperationalState'
                 numOfAlarmRecords:
                   type: integer
                 lastModification:
-                  $ref: 'comDefs.yaml#/components/schemas/DateTime'
+                  $ref: '#/components/schemas/DateTime'
                 alarmRecords:
                   description: >-
-                     This resource represents a map of alarm records.
-                     The alarmIds are used as keys in the map.
+                    This resource represents a map of alarm records.
+                    The alarmIds are used as keys in the map.
                   type: object
                   additionalProperties:
                     $ref: 'faultMnS.yaml#/components/schemas/AlarmRecord'
 
-#-------- Definition of YAML arrays for name-contained IOCs ----------------------
+#-------- Definition of JSON arrays for name-contained IOCs ----------------------
 
     VsDataContainer-Multiple:
       type: array
@@ -1480,37 +1552,39 @@ components:
     PerfMetricJob-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/PerfMetricJob-Single'
+        $ref: '#/components/schemas/MetricProdJob-Single'
     ThresholdMonitor-Multiple:
       type: array
       items:
         $ref: '#/components/schemas/ThresholdMonitor-Single'
-    TraceJob-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/TraceJob-Single'
     NtfSubscriptionControl-Multiple:
       type: array
       items:
         $ref: '#/components/schemas/NtfSubscriptionControl-Single'
+    TraceJob-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/TraceJob-Single'
 
 #-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
 
     resources-genericNrm:
       oneOf:
 
-       - $ref: '#/components/schemas/VsDataContainer-Single'
+        - $ref: '#/components/schemas/VsDataContainer-Single'
+
+        - $ref: '#/components/schemas/ManagementNode-Single'
+        - $ref: '#/components/schemas/MeContext-Single'
 
-       - $ref: '#/components/schemas/ManagementNode-Single'
-       - $ref: '#/components/schemas/MeContext-Single'
+        - $ref: '#/components/schemas/ManagedNFService-Single'
 
-       - $ref: '#/components/schemas/ManagedNFService-Single'
+        - $ref: '#/components/schemas/PerfMetricJob-Single'
 
-       - $ref: '#/components/schemas/PerfMetricJob-Single'
-       - $ref: '#/components/schemas/ThresholdMonitor-Single'
-       - $ref: '#/components/schemas/TraceJob-Single'
+        - $ref: '#/components/schemas/ThresholdMonitoringCapability-Single'
+        - $ref: '#/components/schemas/ThresholdMonitor-Single'
 
-       - $ref: '#/components/schemas/NtfSubscriptionControl-Single'
-       - $ref: '#/components/schemas/HeartbeatControl-Single'
+        - $ref: '#/components/schemas/NtfSubscriptionControl-Single'
+        - $ref: '#/components/schemas/HeartbeatControl-Single'
+        - $ref: '#/components/schemas/TraceJob-Single'
 
-       - $ref: '#/components/schemas/AlarmList-Single'
+        - $ref: '#/components/schemas/AlarmList-Single'
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/heartbeatNtf.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/heartbeatNtf.yaml
index efa3185bdb..afde5066dd 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/heartbeatNtf.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/heartbeatNtf.yaml
@@ -1,25 +1,23 @@
 openapi: 3.0.1
 info:
   title: Heartbeat notification
-  version: 16.6.0
+  version: 16.3.0
   description: >-
-    OAS 3.0.1 definition of the heartbeat notification
+    OAS 3.0.1 specification of the heartbeat notification
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
-  description: 3GPP TS 28.532 V16.6.0; Generic management services
+  description: 3GPP TS 28.532 V16.3.0; Heartbeat notification
   url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.6532/
 paths: {}
 components:
   schemas:
-    HeartbeatNotificationTypes:
-      type: string
-      enum:
-        - notifyHeartbeat
-    NotifyHeartbeat:
+    hearbeatNtfPeriod-Type:
+      type: integer
+    notifyHeartbeat-NotifType:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: 'provMnS.yaml#/components/schemas/header-Type'
         - type: object
           properties:
             heartbeatNtfPeriod:
-              type: integer
+              $ref: '#/components/schemas/hearbeatNtfPeriod-Type'
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/nrNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/nrNrm.yaml
index 3ff7a21ec1..02ab23ce25 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/nrNrm.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/nrNrm.yaml
@@ -1,13 +1,13 @@
 openapi: 3.0.1
 info:
   title: NR NRM
-  version: 16.6.0
+  version: 16.5.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
-  description: 3GPP TS 28.541 V16.6.0; 5G NRM, NR NRM
+  description: 3GPP TS 28.541 V16.5.0; 5G NRM, NR NRM
   url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/
 paths: {}
 components:
@@ -55,7 +55,7 @@ components:
       type: object
       properties:
         mcc:
-          $ref: 'comDefs.yaml#/components/schemas/Mcc'
+          $ref: 'genericNrm.yaml#/components/schemas/Mcc'
         mnc:
           $ref: '#/components/schemas/Mnc'
     PlmnIdList:
@@ -73,22 +73,16 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/PlmnInfo'
-    GGnbId:
-        type: string
-        pattern: '^[0-9]{3}[0-9]{2,3}-(22|23|24|25|26|27|28|29|30|31|32)-[0-9]{1,10}'
-    GEnbId:
-        type: string
-        pattern: '^[0-9]{3}[0-9]{2,3}-(18|20|21|22)-[0-9]{1,7}'
 
     GGnbIdList:
         type: array
-        items:
-          $ref: '#/components/schemas/GGnbId'
+        items: string
+        pattern: '^[0-9]{3}[0-9]{2,3}-(22|23|24|25|26|27|28|29|30|31|32)-[0-9]{1,10}'
 
     GEnbIdList:
         type: array
-        items:
-          $ref: '#/components/schemas/GEnbId'
+        items: string
+        pattern: '^[0-9]{3}[0-9]{2,3}-(18|20|21|22)-[0-9]{1,7}'
 
     NrPci:
       type: integer
@@ -172,7 +166,7 @@ components:
         timeDuration:
           type: integer
 
-    UeAccProbilityDist:
+    UeAccProbilityDistPerSSB:
       type: object
       properties:
         targetProbability:
@@ -180,7 +174,7 @@ components:
         numberofpreamblessent:
           type: integer
 
-    UeAccDelayProbilityDist:
+    UeAccDelayProbilityDistPerSSB:
       type: object
       properties:
         targetProbability:
@@ -268,7 +262,8 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/RrmPolicyMember'
-    AddressWithVlan:
+
+    LocalAddress:
       type: object
       properties:
         ipv4Address:
@@ -279,11 +274,6 @@ components:
           type: integer
           minimum: 0
           maximum: 4096
-    LocalAddress:
-      type: object
-      properties:
-        addressWithVlan:
-          $ref: '#/components/schemas/AddressWithVlan'
         port:
           type: integer
           minimum: 0
@@ -408,7 +398,7 @@ components:
     RSSetId:
       type: integer
       maximum: 4194303
-
+    
     RSSetType:
       type: string
       enum:
@@ -421,11 +411,11 @@ components:
         rimRSSubcarrierSpacing:
           type: integer
         rIMRSBandwidth:
-         type: integer
+          type: integer
         nrofGlobalRIMRSFrequencyCandidates:
           type: integer
         rimRSCommonCarrierReferencePoint:
-         type: integer
+          type: integer
         rimRSStartingFrequencyOffsetIdList:
           type: array
           items:
@@ -435,13 +425,13 @@ components:
       type: object
       properties:
         nrofRIMRSSequenceCandidatesofRS1:
-         type: integer
+          type: integer
         rimRSScrambleIdListofRS1:
           type: array
           items:
             type: integer
         nrofRIMRSSequenceCandidatesofRS2:
-         type: integer
+          type: integer
         rimRSScrambleIdListofRS2:
           type: array
           items:
@@ -450,7 +440,7 @@ components:
           type: string
           enum:
             - ENABLE
-            - DISABLE
+            - DISABLE          
         RIMRSScrambleTimerMultiplier:
           type: integer
         RIMRSScrambleTimerOffset:
@@ -462,33 +452,33 @@ components:
         dlULSwitchingPeriod1:
           type: string
           enum:
-           - MS0P5
-           - MS0P625
-           - MS1
-           - MS1P25
-           - MS2
-           - MS2P5
-           - MS3
-           - MS4
-           - MS5
-           - MS10
-           - MS20
+            - MS0P5
+            - MS0P625
+            - MS1
+            - MS1P25
+            - MS2
+            - MS2P5
+            - MS3
+            - MS4
+            - MS5
+            - MS10
+            - MS20
         symbolOffsetOfReferencePoint1:
-           type: integer
+          type: integer
         dlULSwitchingPeriod2:
           type: string
           enum:
-           - MS0P5
-           - MS0P625
-           - MS1
-           - MS1P25
-           - MS2
-           - MS2P5
-           - MS3
-           - MS4
-           - MS5
-           - MS10
-           - MS20
+            - MS0P5
+            - MS0P625
+            - MS1
+            - MS1P25
+            - MS2
+            - MS2P5
+            - MS3
+            - MS4
+            - MS5
+            - MS10
+            - MS20
         symbolOffsetOfReferencePoint2:
           type: integer
         totalnrofSetIdofRS1:
@@ -511,12 +501,12 @@ components:
           type: string
           enum:
             - ENABLE
-            - DISABLE
+            - DISABLE          
         enablenearfarIndicationRS2:
           type: string
           enum:
             - ENABLE
-            - DISABLE
+            - DISABLE          
 
     RimRSReportInfo:
       type: object
@@ -531,7 +521,7 @@ components:
             - RS1
             - RS2
             - RS1forEnoughMitigation
-            - RS1forNotEnoughMitigation
+            - RS1forNotEnoughMitigation          
 
     RimRSReportConf:
       type: object
@@ -540,9 +530,9 @@ components:
           type: string
           enum:
             - ENABLE
-            - DISABLE
+            - DISABLE          
         reportInterval:
-           type: integer
+          type: integer
         nrofRIMRSReportInfo:
           type: integer
         maxPropagationDelay:
@@ -551,22 +541,6 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/RimRSReportInfo'
-    TceMappingInfo:
-      type: object
-      properties:
-        TceIPAddress:
-          oneOf:
-            - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr'
-            - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr'
-        TceID:
-          type: integer
-        PlmnTarget:
-          $ref: '#/components/schemas/PlmnId'
-    TceMappingInfoList:
-      type: array
-      items:
-        $ref: '#/components/schemas/TceMappingInfo'
-
 
 #-------- Definition of abstract IOCs --------------------------------------------
 
@@ -619,17 +593,14 @@ components:
               $ref: '5gcNrm.yaml#/components/schemas/Configurable5QISet-Multiple'
             RimRSGlobal:
               $ref: '#/components/schemas/RimRSGlobal-Single'
-            Dynamic5QISet:
-              $ref: '5gcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple'
-
     ManagedElement-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
-              $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-Attr'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-ncO'
+              $ref: 'genericNRM.yaml#/components/schemas/ManagedElement-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedElement-ncO'
         - type: object
           properties:
             GnbDuFunction:
@@ -652,17 +623,15 @@ components:
               $ref: '#/components/schemas/CESManagementFunction-Single'
             Configurable5QISet:
               $ref: '5gcNrm.yaml#/components/schemas/Configurable5QISet-Multiple'
-            Dynamic5QISet:
-              $ref: '5gcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple'
 
     GnbDuFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     gnbDuId:
@@ -675,7 +644,7 @@ components:
                       $ref: '#/components/schemas/GnbIdLength'
                     rimRSReportConf:
                       $ref: '#/components/schemas/RimRSReportConf'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             RRMPolicyRatio:
@@ -690,16 +659,14 @@ components:
               $ref: '#/components/schemas/EP_F1C-Single'
             EP_F1U:
               $ref: '#/components/schemas/EP_F1U-Multiple'
-            DRACHOptimizationFunction:
-              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
     GnbCuUpFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     gnbId:
@@ -711,10 +678,8 @@ components:
                     plmnInfoList:
                       $ref: '#/components/schemas/PlmnInfoList'
                     configurable5QISetRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
-                    dynamic5QISetRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             RRMPolicyRatio:
@@ -733,12 +698,12 @@ components:
               $ref: '#/components/schemas/EP_S1U-Multiple'
     GnbCuCpFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     gnbId:
@@ -756,18 +721,16 @@ components:
                     x2WhiteList:
                       $ref: '#/components/schemas/GGnbIdList'
                     xnWhiteList:
-                      $ref: '#/components/schemas/GGnbIdList'
-                    x2XnHOBlackList:
+                      $ref: '#/components/schemas/GGnbIdList '
+                    xnHOBlackList:
+                      $ref: '#/components/schemas/GGnbIdList '
+                    x2HOBlackList:
                       $ref: '#/components/schemas/GEnbIdList'
                     mappingSetIDBackhaulAddress:
                       $ref: '#/components/schemas/MappingSetIDBackhaulAddress'
-                    tceMappingInfoList:
-                      $ref: '#/components/schemas/TceMappingInfoList'
                     configurable5QISetRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
-                    dynamic5QISetRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             RRMPolicyRatio:
@@ -788,17 +751,19 @@ components:
               $ref: '#/components/schemas/DANRManagementFunction-Single'
             DESManagementFunction:
               $ref: '#/components/schemas/DESManagementFunction-Single'
+            DRACHOptimizationFunction:
+              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
             DMROFunction:
               $ref: '#/components/schemas/DMROFunction-Single'
 
     NrCellCu-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     cellLocalId:
@@ -806,8 +771,8 @@ components:
                     plmnInfoList:
                       $ref: '#/components/schemas/PlmnInfoList'
                     nRFrequencyRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             RRMPolicyRatio:
@@ -822,27 +787,27 @@ components:
               $ref: '#/components/schemas/EUtranFreqRelation-Multiple'
             DESManagementFunction:
               $ref: '#/components/schemas/DESManagementFunction-Single'
+            DRACHOptimizationFunction:
+              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
             DMROFunction:
               $ref: '#/components/schemas/DMROFunction-Single'
             CESManagementFunction:
               $ref: '#/components/schemas/CESManagementFunction-Single'
-            DPCIConfigurationFunction:
-              $ref: '#/components/schemas/DPCIConfigurationFunction-Single'
 
     NrCellDu-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     administrativeState:
-                      $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
+                      $ref: 'genericNRM.yaml#/components/schemas/AdministrativeState'
                     operationalState:
-                      $ref: 'comDefs.yaml#/components/schemas/OperationalState'
+                      $ref: 'genericNRM.yaml#/components/schemas/OperationalState'
                     cellLocalId:
                       type: integer
                     cellState:
@@ -882,70 +847,65 @@ components:
                     nrSectorCarrierRef:
                       type: array
                       items:
-                        $ref: 'comDefs.yaml#/components/schemas/Dn'
+                        $ref: 'genericNRM.yaml#/components/schemas/Dn'
                     bwpRef:
                       type: array
                       items:
-                        $ref: 'comDefs.yaml#/components/schemas/Dn'
+                        $ref: 'genericNRM.yaml#/components/schemas/Dn'
                     nRFrequencyRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
                     victimSetRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
                     aggressorSetRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             RRMPolicyRatio:
               $ref: '#/components/schemas/RRMPolicyRatio-Multiple'
+            DPCIConfigurationFunction:
+              $ref: '#/components/schemas/DPCIConfigurationFunction-Single'
             CPCIConfigurationFunction:
               $ref: '#/components/schemas/CPCIConfigurationFunction-Single'
-            DRACHOptimizationFunction:
-              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
 
     NRFrequency-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
-                type: object
-                properties:
-                  absoluteFrequencySSB:
-                    type: integer
-                    minimum: 0
-                    maximum: 3279165
-                  ssbSubCarrierSpacing:
-                    $ref: '#/components/schemas/SsbSubCarrierSpacing'
-                  multiFrequencyBandListNR:
-                    type: integer
-                    minimum: 1
-                    maximum: 256
+              allOf:
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - type: object
+                  properties:
+                    absoluteFrequencySSB:
+                      type: integer
+                      minimum: 0
+                      maximum: 3279165
+                    ssbSubCarrierSpacing:
+                      $ref: '#/components/schemas/SsbSubCarrierSpacing'
+                    multiFrequencyBandListNR:
+                      type: integer
+                      minimum: 1
+                      maximum: 256
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
     EUtranFrequency-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
-              type: object
-              properties:
-                earfcnDL:
-                  type: integer
-                  minimum: 0
-                  maximum: 262143
-                multiBandInfoListEutra:
-                  type: integer
-                  minimum: 1
-                  maximum: 256
+              $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
 
     NrSectorCarrier-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     txDirection:
@@ -961,20 +921,20 @@ components:
                     bSChannelBwUL:
                       type: integer
                     sectorEquipmentFunctionRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             CommonBeamformingFunction:
               $ref: '#/components/schemas/CommonBeamformingFunction-Single'
     Bwp-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     bwpContext:
@@ -989,10 +949,10 @@ components:
                       type: integer
                     numberOfRBs:
                       type: integer
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
     CommonBeamformingFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1011,7 +971,7 @@ components:
               $ref: '#/components/schemas/Beam-Multiple'
     Beam-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1042,7 +1002,7 @@ components:
                       maximum: 1800
     RRMPolicyRatio-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1059,7 +1019,7 @@ components:
 
     NRCellRelation-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1070,9 +1030,9 @@ components:
                     cellIndividualOffset:
                       $ref: '#/components/schemas/CellIndividualOffset'
                     adjacentNRCellRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
                     nRFrequencyRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
                     isRemoveAllowed:
                       type: boolean
                     isHOAllowed:
@@ -1083,20 +1043,20 @@ components:
                       type: boolean
     EUtranCellRelation-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     adjacentEUtranCellRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
     NRFreqRelation-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1156,73 +1116,23 @@ components:
                     tReselectionNRSfMedium:
                       $ref: '#/components/schemas/TReselectionNRSf'
                     nRFrequencyRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
     EUtranFreqRelation-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
-              type: object
-              properties:
-                    cellIndividualOffset:
-                      $ref: '#/components/schemas/CellIndividualOffset'
-                    blackListEntry:
-                      type: array
-                      items:
-                        type: integer
-                        minimum: 0
-                        maximum: 1007
-                    blackListEntryIdleMode:
-                      type: integer
-                    cellReselectionPriority:
-                      type: integer
-                    cellReselectionSubPriority:
-                      type: number
-                      minimum: 0.2
-                      maximum: 0.8
-                      multipleOf: 0.2
-                    pMax:
-                      type: integer
-                      minimum: -30
-                      maximum: 33
-                    qOffsetFreq:
-                      $ref: '#/components/schemas/QOffsetFreq'
-                    qQualMin:
-                      type: number
-                    qRxLevMin:
-                      type: integer
-                      minimum: -140
-                      maximum: -44
-                    threshXHighP:
-                      type: integer
-                      minimum: 0
-                      maximum: 62
-                    threshXHighQ:
-                      type: integer
-                      minimum: 0
-                      maximum: 31
-                    threshXLowP:
-                      type: integer
-                      minimum: 0
-                      maximum: 62
-                    threshXLowQ:
-                      type: integer
-                      minimum: 0
-                      maximum: 31
-                    tReselectionEutran:
-                      type: integer
-                      minimum: 0
-                      maximum: 7
-                    tReselectionNRSfHigh:
-                      $ref: '#/components/schemas/TReselectionNRSf'
-                    tReselectionNRSfMedium:
-                      $ref: '#/components/schemas/TReselectionNRSf'
+              allOf:
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
+                - type: object
+                  properties:
                     eUTranFrequencyRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
     DANRManagementFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1235,7 +1145,7 @@ components:
 
     DESManagementFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1260,17 +1170,17 @@ components:
                     isProbingCapable:
                       type: string
                       enum:
-                         - yes
-                         - no
+                        - yes
+                        - no
                     energySavingState:
                       type: string
                       enum:
-                         - isNotEnergySaving
-                         - isEnergySaving
+                        - isNotEnergySaving
+                        - isEnergySaving
 
     DRACHOptimizationFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1278,18 +1188,18 @@ components:
                   properties:
                     drachOptimizationControl:
                       type: boolean
-                    ueAccProbilityDist:
-                      $ref: "#/components/schemas/UeAccProbilityDist"
-                    ueAccDelayProbilityDist:
-                      $ref: "#/components/schemas/UeAccDelayProbilityDist"
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+                    ueAccProbilityDistPerSSB:
+                      $ref: "#/components/schemas/UeAccProbilityDistPerSSB"
+                    ueAccDelayProbilityDistPerSSB:
+                      $ref: "#/components/schemas/UeAccDelayProbilityDistPerSSB"
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
 
     DMROFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
-            attributes:
+            attributes: 
                   type: object
                   properties:
                     dmroControl:
@@ -1303,7 +1213,7 @@ components:
 
     DPCIConfigurationFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1316,7 +1226,7 @@ components:
 
     CPCIConfigurationFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1329,7 +1239,7 @@ components:
 
     CESManagementFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1340,17 +1250,17 @@ components:
                     energySavingControl:
                       type: string
                       enum:
-                         - toBeEnergySaving
-                         - toBeNotEnergySaving
+                        - toBeEnergySaving
+                        - toBeNotEnergySaving
                     energySavingState:
                       type: string
                       enum:
-                         - isNotEnergySaving
-                         - isEnergySaving
+                        - isNotEnergySaving
+                        - isEnergySaving
 
     RimRSGlobal-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1367,7 +1277,7 @@ components:
 
     RimRSSet-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
@@ -1392,23 +1302,23 @@ components:
                 rimRSMonitoringOccasionStartingOffset:
                   type: integer
                 nRCellDURefs:
-                  $ref: 'comDefs.yaml#/components/schemas/DnList'
+                  $ref: 'genericNRM.yaml#/components/schemas/DnList'
 
     ExternalGnbDuFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     gnbId:
                       $ref: '#/components/schemas/GnbId'
                     gnbIdLength:
                       $ref: '#/components/schemas/GnbIdLength'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             EP_F1C:
@@ -1417,19 +1327,19 @@ components:
               $ref: '#/components/schemas/EP_F1U-Multiple'
     ExternalGnbCuUpFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     gnbId:
                       $ref: '#/components/schemas/GnbId'
                     gnbIdLength:
                       $ref: '#/components/schemas/GnbIdLength'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             EP_E1:
@@ -1440,13 +1350,13 @@ components:
               $ref: '#/components/schemas/EP_XnU-Multiple'
     ExternalGnbCuCpFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
                 - $ref: >-
-                    genericNrm.yaml#/components/schemas/ManagedFunction-Attr
+                    genericNRM.yaml#/components/schemas/ManagedFunction-Attr
                 - type: object
                   properties:
                     gnbId:
@@ -1455,7 +1365,7 @@ components:
                       $ref: '#/components/schemas/GnbIdLength'
                     plmnId:
                       $ref: '#/components/schemas/PlmnId'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             ExternalNrCellCu:
@@ -1468,12 +1378,12 @@ components:
               $ref: '#/components/schemas/EP_F1C-Multiple'
     ExternalNrCellCu-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     cellLocalId:
@@ -1483,47 +1393,47 @@ components:
                     plmnIdList:
                       $ref: '#/components/schemas/PlmnIdList'
                     nRFrequencyRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
     ExternalENBFunction-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     eNBId:
                       type: integer
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
             ExternalEUTranCell:
               $ref: '#/components/schemas/ExternalEUTranCell-Multiple'
     ExternalEUTranCell-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
                     EUtranFrequencyRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+                      $ref: 'genericNRM.yaml#/components/schemas/Dn'
+        - $ref: 'genericNRM.yaml#/components/schemas/ManagedFunction-ncO'
 
     EP_XnC-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1532,12 +1442,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_E1-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1546,12 +1456,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_F1C-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1560,12 +1470,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_NgC-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1574,12 +1484,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_X2C-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1588,12 +1498,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_XnU-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1602,12 +1512,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_F1U-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1616,29 +1526,26 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_NgU-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
                       $ref: '#/components/schemas/LocalAddress'
                     remoteAddress:
                       $ref: '#/components/schemas/RemoteAddress'
-                    epTransportRefs:
-                      $ref: 'comDefs.yaml#/components/schemas/DnList'
-
     EP_X2U-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1647,12 +1554,12 @@ components:
                       $ref: '#/components/schemas/RemoteAddress'
     EP_S1U-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr'
         - type: object
           properties:
             attributes:
               allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - $ref: 'genericNRM.yaml#/components/schemas/EP_RP-Attr'
                 - type: object
                   properties:
                     localAddress:
@@ -1831,7 +1738,6 @@ components:
         - $ref: '#/components/schemas/CommonBeamformingFunction-Single'
         - $ref: '#/components/schemas/Beam-Single'
         - $ref: '#/components/schemas/RRMPolicyRatio-Single'
-
         - $ref: '#/components/schemas/NRCellRelation-Single'
         - $ref: '#/components/schemas/EUtranCellRelation-Single'
         - $ref: '#/components/schemas/NRFreqRelation-Single'
@@ -1865,4 +1771,3 @@ components:
         - $ref: '#/components/schemas/EP_NgU-Single'
         - $ref: '#/components/schemas/EP_X2U-Single'
         - $ref: '#/components/schemas/EP_S1U-Single'
-
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/provMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/provMnS.yaml
index 1dd467e16a..b2f84a4d2a 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/provMnS.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/provMnS.yaml
@@ -1,25 +1,25 @@
 openapi: 3.0.1
 info:
   title: Provisioning MnS
-  version: 16.5.0
+  version: 16.4.0
   description: >-
     OAS 3.0.1 definition of the Provisioning MnS
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
-  description: 3GPP TS 28.532; Generic management services
+  description: 3GPP TS 28.532 V16.4.0; Generic management services
   url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/
 servers:
-  - url: '{MnSRoot}/ProvMnS/{MnSVersion}/{URI-LDN-first-part}'
+  - url: 'http://{URI-DN-prefix}/{root}/ProvMnS/v1640/{LDN-first-part}'
     variables:
-      MnSRoot:
-        description: See clause 4.4.2 of TS 32.158
-        default: http://example.com/3GPPManagement
-      MnSVersion:
-        description: Version number of the OpenAPI definition
-        default: XXX
-      URI-LDN-first-part:
-        description: See clause 4.4.2 of TS 32.158
+      URI-DN-prefix:
+        description: See subclause 4.4 of TS 32.158
+        default: example.com
+      root:
+        description: See subclause 4.4 of TS 32.158
+        default: 3GPPManagement
+      LDN-first-part:
+        description: See subclause 4.4 of TS 32.158
         default: ''
 paths:
   '/{className}={id}':
@@ -28,12 +28,12 @@ paths:
         in: path
         required: true
         schema:
-          type: string
+          $ref: '#/components/schemas/className-PathType'
       - name: id
         in: path
         required: true
         schema:
-          type: string
+          $ref: '#/components/schemas/id-PathType'
     put:
       summary: Replaces a complete single resource or creates it if it does not exist
       description: >-
@@ -44,7 +44,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Resource'
+              $ref: '#/components/schemas/resourcePut-RequestType'
       responses:
         '200':
           description: >-
@@ -60,7 +60,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Resource'
+                $ref: '#/components/schemas/resourceUpdate-ResponseType'
         '201':
           description: >-
             Success case ("201 Created").
@@ -70,7 +70,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Resource'
+                $ref: '#/components/schemas/resourceCreation-ResponseType'
         '204':
           description: >-
             Success case ("204 No Content").
@@ -82,7 +82,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                $ref: '#/components/schemas/error-ResponseType'
       callbacks:
         notifyMOICreation:
           '{request.body#/notificationRecipientAddress}':
@@ -92,7 +92,7 @@ paths:
                 content:
                   application/json:
                     schema:
-                      $ref: '#/components/schemas/NotifyMoiCreation'
+                      $ref: '#/components/schemas/notifyMOICreation-NotifType'
               responses:
                 '204':
                   description: >-
@@ -104,7 +104,7 @@ paths:
                   content:
                     application/json:
                       schema:
-                        $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                        $ref: '#/components/schemas/error-ResponseType'
         notifyMOIDeletion:
           '{request.body#/notificationRecipientAddress}':
             post:
@@ -113,7 +113,7 @@ paths:
                 content:
                   application/json:
                     schema:
-                      $ref: '#/components/schemas/NotifyMoiDeletion'
+                      $ref: '#/components/schemas/notifyMOIDeletion-NotifType'
               responses:
                 '204':
                   description: >-
@@ -125,8 +125,8 @@ paths:
                   content:
                     application/json:
                       schema:
-                        $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
-        notifyMOIAttributeValueChanges:
+                        $ref: '#/components/schemas/error-ResponseType'
+        notifyMOIAttributeValueChange:
           '{request.body#/notificationRecipientAddress}':
             post:
               requestBody:
@@ -134,7 +134,7 @@ paths:
                 content:
                   application/json:
                     schema:
-                      $ref: '#/components/schemas/NotifyMoiAttributeValueChanges'
+                      $ref: '#/components/schemas/notifyMOIAttributeValueChange-NotifType'
               responses:
                 '204':
                   description: >-
@@ -146,7 +146,7 @@ paths:
                   content:
                     application/json:
                       schema:
-                        $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                        $ref: '#/components/schemas/error-ResponseType'
         notifyMOIChanges:
           '{request.body#/notificationRecipientAddress}':
             post:
@@ -155,7 +155,7 @@ paths:
                 content:
                   application/json:
                     schema:
-                      $ref: '#/components/schemas/NotifyMoiChanges'
+                      $ref: '#/components/schemas/notifyMOIChanges-NotifType'
               responses:
                 '204':
                   description: >-
@@ -167,7 +167,7 @@ paths:
                   content:
                     application/json:
                       schema:
-                        $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                        $ref: '#/components/schemas/error-ResponseType'
     get:
       summary: Reads one or multiple resources
       description: >-
@@ -183,7 +183,7 @@ paths:
             mechanism is specified in the present document.
           required: false
           schema:
-            $ref: '#/components/schemas/Scope'
+            $ref: '#/components/schemas/scope-QueryType'
           style: form
           explode: true
         - name: filter
@@ -196,7 +196,7 @@ paths:
             document.
           required: false
           schema:
-            $ref: 'comDefs.yaml#/components/schemas/Filter'
+            $ref: '#/components/schemas/filter-QueryType'
         - name: attributes
           in: query
           description: >-
@@ -204,9 +204,7 @@ paths:
             are returned.
           required: true
           schema:
-            type: array
-            items:
-              type: string
+            $ref: '#/components/schemas/attributes-QueryType'
           style: form
           explode: false
         - name: fields
@@ -216,9 +214,7 @@ paths:
             that are returned.
           required: false
           schema:
-            type: array
-            items:
-              type: string
+            $ref: '#/components/schemas/fields-QueryType'
           style: form
           explode: false
       responses:
@@ -233,13 +229,13 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Resource'
+                $ref: '#/components/schemas/resourceRetrieval-ResponseType'
         default:
           description: Error case.
           content:
             application/json:
               schema:
-                $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                $ref: '#/components/schemas/error-ResponseType'
     patch:
       summary: Patches one or multiple resources
       description: >-
@@ -258,20 +254,16 @@ paths:
         content:
           application/merge-patch+json:
             schema:
-              $ref: '#/components/schemas/Resource'
+              $ref: '#/components/schemas/jsonMergePatch-RequestType'
           application/3gpp-merge-patch+json:
             schema:
-              $ref: '#/components/schemas/Resource'
+              $ref: '#/components/schemas/3gppJsonMergePatch-RequestType'
           application/json-patch+json:
             schema:
-              type: array
-              items:
-                type: object
+              $ref: '#/components/schemas/jsonPatch-RequestType'
           application/3gpp-json-patch+json:
             schema:
-              type: array
-              items:
-                type: object
+              $ref: '#/components/schemas/3gppJsonPatch-RequestType'
       responses:
         '200':
           description: >-
@@ -284,7 +276,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Resource'
+                $ref: '#/components/schemas/resourceUpdate-ResponseType'
         '204':
           description: >-
             Success case ("204 No Content").
@@ -296,7 +288,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                $ref: '#/components/schemas/error-ResponseType'
     delete:
       summary: Deletes one or multiple resources
       description: >-
@@ -311,9 +303,7 @@ paths:
             mechanism is specified in the present document.
           required: false
           schema:
-            $ref: '#/components/schemas/Scope'
-          style: form
-          explode: true
+            $ref: '#/components/schemas/scope-QueryType'
         - name: filter
           in: query
           description: >-
@@ -324,7 +314,7 @@ paths:
             document.
           required: false
           schema:
-            $ref: 'comDefs.yaml#/components/schemas/Filter'
+            $ref: '#/components/schemas/filter-QueryType'
       responses:
         '200':
           description: >-
@@ -341,66 +331,136 @@ paths:
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  $ref: 'comDefs.yaml#/components/schemas/Uri'
+                $ref: '#/components/schemas/resourceDeletion-ResponseType'
         default:
           description: Error case.
           content:
             application/json:
               schema:
-                $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
+                $ref: '#/components/schemas/error-ResponseType'
 components:
   schemas:
-    CorrelatedNotification:
+    dateTime-Type:
+      type: string
+      format: date-time
+    long-Type:
+      type: integer
+      format: int64
+    uri-Type:
+      type: string
+    correlatedNotification-Type:
       type: object
       properties:
         source:
-          $ref: 'comDefs.yaml#/components/schemas/Dn'
+          $ref: '#/components/schemas/uri-Type'
         notificationIds:
           type: array
           items:
-            $ref: 'comDefs.yaml#/components/schemas/NotificationId'
-      required:
-        - source
-        - notificationIds
-    CmNotificationTypes:
+            $ref: '#/components/schemas/notificationId-Type'
+    notificationId-Type:
+      $ref: '#/components/schemas/long-Type'
+    notificationType-Type:
       type: string
       enum:
         - notifyMOICreation
         - notifyMOIDeletion
-        - notifyMOIAttributeValueChanges
-        - notifyMOIChanges
-    SourceIndicator:
+        - notifyMOIAttributeValueChange
+    systemDN-Type:
       type: string
-      enum:
-        - RESOURCE_OPERATION
-        - MANAGEMENT_OPERATION
-        - SON_OPERATION
-        - UNKNOWN
-    Operation:
+    additionalText-Type:
+      type: string
+    sourceIndicator-Type:
       type: string
       enum:
-        - CREATE
-        - DELETE
-        - REPLACE
-    ScopeType:
+        - resourceOperation
+        - mangementOperation
+        - sONOperation
+        - unknown
+    header-Type:
+      type: object
+      properties:
+        href:
+          $ref: '#/components/schemas/uri-Type'
+        notificationId:
+          $ref: '#/components/schemas/notificationId-Type'
+        notificationType:
+          $ref: '#/components/schemas/notificationType-Type'
+        eventTime:
+          $ref: '#/components/schemas/dateTime-Type'
+        systemDN:
+          $ref: '#/components/schemas/systemDN-Type'
+      required:
+        - href
+        - notificationId
+        - notificationType
+        - eventTime
+        - systemDN
+    scopeType-Type:
       type: string
       enum:
         - BASE_ONLY
         - BASE_NTH_LEVEL
         - BASE_SUBTREE
         - BASE_ALL
-    Scope:
+    scopeLevel-Type:
+      type: integer
+    className-PathType:
+      type: string
+    id-PathType:
+      type: string
+    attributes-QueryType:
+      type: array
+      items:
+        type: string
+    fields-QueryType:
+      type: array
+      items:
+        type: string
+    filter-QueryType:
+      type: string
+    scope-QueryType:
       type: object
       properties:
         scopeType:
-          $ref: '#/components/schemas/ScopeType'
+          $ref: '#/components/schemas/scopeType-Type'
         scopeLevel:
-          type: integer
+          $ref: '#/components/schemas/scopeLevel-Type'
 
+    resourcePut-RequestType:
+      $ref: '#/components/schemas/resourceRepresentation-Type'
+    jsonMergePatch-RequestType:
+      $ref: '#/components/schemas/resourceRepresentation-Type'
+    3gppJsonMergePatch-RequestType:
+      $ref: '#/components/schemas/resourceRepresentation-Type'
+    jsonPatch-RequestType:
+      type: array
+      items:
+        type: object
+    3gppJsonPatch-RequestType:
+      type: array
+      items:
+        type: object
 
-    Resource:
+    error-ResponseType:
+      type: object
+      properties:
+        error:
+          type: object
+          properties:
+            errorInfo:
+              type: string
+    resourceRetrieval-ResponseType:
+      $ref: '#/components/schemas/resourceRepresentation-Type'
+    resourceCreation-ResponseType:
+      $ref: '#/components/schemas/resourceRepresentation-Type'
+    resourceUpdate-ResponseType:
+      $ref: '#/components/schemas/resourceRepresentation-Type'
+    resourceDeletion-ResponseType:
+      type: array
+      items:
+        $ref: '#/components/schemas/uri-Type'
+
+    resourceRepresentation-Type:
       oneOf:
         - type: object
           properties:
@@ -418,83 +478,102 @@ components:
             - $ref: '5gcNrm.yaml#/components/schemas/resources-5gcNrm'
             - $ref: 'sliceNrm.yaml#/components/schemas/resources-sliceNrm'
 
-    MoiChange:
+    mOIChange-Type:
       type: object
       properties:
         notificationId:
-          $ref: 'comDefs.yaml#/components/schemas/NotificationId'
+          $ref: '#/components/schemas/notificationId-Type'
         correlatedNotifications:
           type: array
           items:
-            $ref: '#/components/schemas/CorrelatedNotification'
+            $ref: '#/components/schemas/correlatedNotification-Type'
         additionalText:
-          type: string
+          $ref: '#/components/schemas/additionalText-Type'
         sourceIndicator:
-          $ref: '#/components/schemas/SourceIndicator'
+          $ref: '#/components/schemas/sourceIndicator-Type'
         path:
-          $ref: 'comDefs.yaml#/components/schemas/Uri'
+          $ref: '#/components/schemas/uri-Type'
         operation:
-          $ref: '#/components/schemas/Operation'
+          type: string
+          enum:
+            - CREATE
+            - DELETE
+            - REPLACE
         value:
           oneOf:
-            - $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
-            - $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet'
+            - type: object
+              additionalProperties:
+                nullable: true
+            - type: array
+              items:
+                type: object
+              minItems: 1
+              maxItems: 2
 
-    NotifyMoiCreation:
+    notifyMOICreation-NotifType:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/header-Type'
         - type: object
           properties:
             correlatedNotifications:
               type: array
               items:
-                $ref: '#/components/schemas/CorrelatedNotification'
+                $ref: '#/components/schemas/correlatedNotification-Type'
             additionalText:
-              type: string
+              $ref: '#/components/schemas/additionalText-Type'
             sourceIndicator:
-              $ref: '#/components/schemas/SourceIndicator'
+              $ref: '#/components/schemas/sourceIndicator-Type'
             attributeList:
-              $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
-    NotifyMoiDeletion:
+              type: object
+              additionalProperties:
+                nullable: true
+    notifyMOIDeletion-NotifType:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/header-Type'
         - type: object
           properties:
             correlatedNotifications:
               type: array
               items:
-                $ref: '#/components/schemas/CorrelatedNotification'
+                $ref: '#/components/schemas/correlatedNotification-Type'
             additionalText:
-              type: string
+              $ref: '#/components/schemas/additionalText-Type'
             sourceIndicator:
-              $ref: '#/components/schemas/SourceIndicator'
+              $ref: '#/components/schemas/sourceIndicator-Type'
             attributeList:
-              $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet'
-    NotifyMoiAttributeValueChanges:
+              type: object
+              additionalProperties: true
+    notifyMOIAttributeValueChange-NotifType:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/header-Type'
         - type: object
           properties:
             correlatedNotifications:
               type: array
               items:
-                $ref: '#/components/schemas/CorrelatedNotification'
+                $ref: '#/components/schemas/correlatedNotification-Type'
             additionalText:
-              type: string
+              $ref: '#/components/schemas/additionalText-Type'
             sourceIndicator:
-              $ref: '#/components/schemas/SourceIndicator'
-            attributeListValueChanges:
-              $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet'
+              $ref: '#/components/schemas/sourceIndicator-Type'
+            attributeValueChange:
+              type: object
+              additionalProperties:
+                type: array
+                minItems: 1
+                maxItems: 2
+                items:
+                  nullable: true
           required:
-            - attributeListValueChanges
-    NotifyMoiChanges:
+            - attributeValueChange
+    notifyMOIChanges-NotifType:
       allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
+        - $ref: '#/components/schemas/header-Type'
         - type: object
           properties:
-            moiChanges:
+            mOIChanges:
               type: array
               items:
-                $ref: '#/components/schemas/MoiChange'
+                $ref: '#/components/schemas/mOIChange-Type'
           required:
-            - moiChanges
+            - mOIChanges
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/sliceNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/sliceNrm.yaml
index 9bf5319fc4..8e03d5ec92 100644
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/sliceNrm.yaml
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/sliceNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Slice NRM
-  version: 16.8.0
+  version: 16.4.0
   description: >-
     OAS 3.0.1 specification of the Slice NRM
     @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -30,68 +30,17 @@ components:
       enum:
         - SHARED
         - NON-SHARED
-    NetworkSliceSharingIndicator:
-      type: string
-      enum:
-        - SHARED
-        - NON-SHARED
-    PerfReqEmbb:
-      type: object
-      properties:
-        expDataRateDL:
-          type: number
-        expDataRateUL:
-          type: number
-        areaTrafficCapDL:
-          type: number
-        areaTrafficCapUL:
-          type: number
-        userDensity:
-          type: number
-        activityFactor:
-          type: number
-    PerfReqEmbbList:
-      type: array
-      items:
-        $ref: '#/components/schemas/PerfReqEmbb'
-    PerfReqUrllc:
-      type: object
-      properties:
-        cSAvailabilityTarget:
-          type: number
-        cSReliabilityMeanTime:
-          type: string
-        expDataRate:
-          type: number
-        msgSizeByte:
-          type: string
-        transferIntervalTarget:
-          type: string
-        survivalTime:
-          type: string
-    PerfReqUrllcList:
-      type: array
-      items:
-        $ref: '#/components/schemas/PerfReqUrllc'
-    PerfReq:
-      oneOf:
-        - $ref: '#/components/schemas/PerfReqEmbbList'
-        - $ref: '#/components/schemas/PerfReqUrllcList'
     Category:
       type: string
       enum:
         - CHARACTER
         - SCALABILITY
     Tagging:
-      type: array
-      items:
-        type: string
-        enum:
-          - PERFORMANCE
-          - FUNCTION
-          - OPERATION
-
-
+      type: string
+      enum:
+        - PERFORMANCE
+        - FUNCTION
+        - OPERATION
     Exposure:
       type: string
       enum:
@@ -184,6 +133,13 @@ components:
           $ref: '#/components/schemas/ServAttrCom'
         kPIList:
           type: string
+    SupportedAccessTech:
+      type: object
+      properties:
+        servAttrCom:
+          $ref: '#/components/schemas/ServAttrCom'
+        accTechList:
+          type: integer
     UserMgmtOpen:
       type: object
       properties:
@@ -212,13 +168,15 @@ components:
           type: string
         nsName:
           type: string
-    ServiceProfile:
+    ServiceProfileList:
       type: object
-      properties:
-          serviceProfileId:
-            type: string
-          plmnInfoList:
-            $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList'
+      additionalProperties:
+        type: object
+        properties:
+          snssaiList:
+            $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
+          plmnIdList:
+            $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList'
           maxNumberofUEs:
             type: number
           latency:
@@ -227,8 +185,8 @@ components:
             $ref: '#/components/schemas/MobilityLevel'
           sst:
             $ref: 'nrNrm.yaml#/components/schemas/Sst'
-          networkSliceSharingIndicator:
-            $ref: '#/components/schemas/NetworkSliceSharingIndicator'
+          resourceSharingLevel:
+            $ref: '#/components/schemas/SharingLevel'
           availability:
             type: number
           delayTolerance:
@@ -249,6 +207,8 @@ components:
             $ref: '#/components/schemas/MaxNumberofConns'
           kPIMonitoring:
             $ref: '#/components/schemas/KPIMonitoring'
+          supportedAccessTech:
+            $ref: '#/components/schemas/SupportedAccessTech'
           userMgmtOpen:
             $ref: '#/components/schemas/UserMgmtOpen'
           v2XModels:
@@ -267,16 +227,15 @@ components:
             type: string
           reliability:
             type: string
-    SliceProfile:
+    SliceProfileList:
       type: object
-      properties:
-          sliceProfileId:
-            type: string
-
-          plmnInfoList:
-            $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList'
-          perfReq:
-            $ref: '#/components/schemas/PerfReq'
+      additionalProperties:
+        type: object
+        properties:
+          snssaiList:
+            $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
+          plmnIdList:
+            $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList'
           maxNumberofUEs:
             type: number
           coverageAreaTAList:
@@ -292,39 +251,10 @@ components:
       oneOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr'
         - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr'
-    ServiceProfileList:
-       type: array
-       items:
-        $ref: '#/components/schemas/ServiceProfile'
-
-    SliceProfileList:
-      type: array
-      items:
-        $ref: '#/components/schemas/SliceProfile'
 
 #------------ Definition of concrete IOCs ----------------------------------------
 
-    SubNetwork-Single:
-      allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
-        - type: object
-          properties:
-            attributes:
-              allOf:
-                - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr'
-        - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO'
-        - type: object
-          properties:
-            SubNetwork:
-              $ref: '#/components/schemas/SubNetwork-Multiple'
-            NetworkSlice:
-              $ref: '#/components/schemas/NetworkSlice-Multiple'
-            NetworkSliceSubnet:
-              $ref: '#/components/schemas/NetworkSliceSubnet-Multiple'
-            EP_Transport:
-              $ref: '#/components/schemas/EP_Transport-Multiple'
-
-    NetworkSlice-Single:
+    NetworkSlice:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
@@ -335,15 +265,15 @@ components:
                 - type: object
                   properties:
                     networkSliceSubnetRef:
-                      $ref: 'comDefs.yaml#/components/schemas/Dn'
+                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
                     operationalState:
-                      $ref: 'comDefs.yaml#/components/schemas/OperationalState'
+                      $ref: 'genericNrm.yaml#/components/schemas/OperationalState'
                     administrativeState:
-                      $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
+                      $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState'
                     serviceProfileList:
                       $ref: '#/components/schemas/ServiceProfileList'
 
-    NetworkSliceSubnet-Single:
+    NetworkSliceSubnet:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
         - type: object
@@ -354,20 +284,20 @@ components:
                 - type: object
                   properties:
                     managedFunctionRefList:
-                      $ref: 'comDefs.yaml#/components/schemas/DnList'
+                      $ref: 'genericNrm.yaml#/components/schemas/DnList'
                     networkSliceSubnetRefList:
-                      $ref: 'comDefs.yaml#/components/schemas/DnList'
+                      $ref: 'genericNrm.yaml#/components/schemas/DnList'
                     operationalState:
-                      $ref: 'comDefs.yaml#/components/schemas/OperationalState'
+                      $ref: 'genericNrm.yaml#/components/schemas/OperationalState'
                     administrativeState:
-                      $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
+                      $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState'
                     nsInfo:
                       $ref: '#/components/schemas/NsInfo'
                     sliceProfileList:
                       $ref: '#/components/schemas/SliceProfileList'
-                    epTransportRefList:
-                      $ref: 'comDefs.yaml#/components/schemas/DnList'
-
+            EPTransport:
+              $ref: '#/components/schemas/EP_Transport-Multiple'
+                      
     EP_Transport-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -379,29 +309,11 @@ components:
                 ipAddress:
                   $ref: '#/components/schemas/IpAddress'
                 logicInterfaceId:
-                  type: string
+                  type: string 
                 nextHopInfo:
-                  type: string
+                  type: string 
                 qosProfile:
-                  type: string
-                epApplicationRefs:
-                  $ref: 'comDefs.yaml#/components/schemas/DnList'
-
-#-------- Definition of JSON arrays for name-contained IOCs ----------------------
-    SubNetwork-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/SubNetwork-Single'
-
-    NetworkSlice-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/NetworkSlice-Single'
-
-    NetworkSliceSubnet-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/NetworkSliceSubnet-Single'
+                  type: string 
 
     EP_Transport-Multiple:
       type: array
@@ -412,7 +324,5 @@ components:
 
     resources-sliceNrm:
       oneOf:
-       - $ref: '#/components/schemas/SubNetwork-Single'
-       - $ref: '#/components/schemas/NetworkSlice-Single'
-       - $ref: '#/components/schemas/NetworkSliceSubnet-Single'
-       - $ref: '#/components/schemas/EP_Transport-Single'
+        - $ref: '#/components/schemas/NetworkSlice'
+        - $ref: '#/components/schemas/NetworkSliceSubnet'
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/streamingDataMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/streamingDataMnS.yaml
new file mode 100644
index 0000000000..f57454f78e
--- /dev/null
+++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/streamingDataMnS.yaml
@@ -0,0 +1,453 @@
+openapi: 3.0.1
+info:
+  title: TS 28.532 Streaming data reporting service
+  version: 16.4.0
+  description: OAS 3.0.1 specification for the Streaming data reporting service (Streaming MnS)
+servers:
+  - url: '{protocol}://{root}/StreamingDataReportingMnS/{version}'
+    variables:
+      protocol:
+        description: Protocol used
+        enum:
+          - http
+          - https
+          - wss
+        default: https
+      root:
+        description: Indicates the host name and optional port, and an optional sequence of path segments that together represent a prefix path.
+        default: example.com
+      version:
+        description: Indicates the current version of the specification
+        default: 16.4.0
+paths:
+  '/connections':
+    post:
+      summary: Inform consumer about reporting streams to be carried by the new connection and receive a new connection id.
+      description: Exchange of meta-data (producer informs consumer about its own identity and the nature of the data to be reported via streaming) phase of the connection establishement by streaming data reporting producer to the streaming data reporting consumer (i.e. streaming target).
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/connectionRequest-Type'
+      responses:
+        '201':
+          description: Success case (201 Created).
+          headers:
+            Location:
+              description: Location of the created connection resource.
+              schema:
+                $ref: '#/components/schemas/connectionId-Type'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/failedConnectionResponse-Type'
+    get:
+      summary: Obtain information about connections.
+      description: Enables the streaming data reporting service producer to obtain information about one or more streaming connections.
+      parameters:
+        - name: connectionIdList
+          in: query
+          description: The list of connectionId for which the connection information is to be returned.
+          required: false
+          schema:
+            type: array
+            items:
+              $ref: '#/components/schemas/connectionId-Type'
+      responses:
+        '200':
+          description: Success case (200 OK). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/connectionInfo-Type'
+        '202':
+          description: Partial success case (202 Partially retrieved). Subset of the resources identified in the request for retrieval are returned in the response message body.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/connectionInfo-Type'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/errorResponse-Type'
+  '/connections/{connectionId}':
+    get:
+      summary: Obtain information about a connection.
+      description: Enables the streaming data reporting service producer to obtain information about one streaming connection.
+      parameters:
+        - name: connectionId
+          in: path
+          description: Indicate the ID (URI) of the connection for which the information is being retrieved
+          required: true
+          schema:
+            $ref: '#/components/schemas/connectionId-Type'
+        - name: Connection
+          in: header
+          schema:
+            $ref: '#/components/schemas/websocketHeaderConnection-Type'
+        - name: Sec-WebSocket-Extensions
+          in: header
+          schema:
+            $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Extensions-Type'
+        - name: Sec-WebSocket-Key
+          in: header
+          schema:
+            $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Key-Type'
+        - name: Sec-WebSocket-Protocol
+          in: header
+          schema:
+            $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Protocol-Type'
+        - name: Sec-WebSocket-Version
+          in: header
+          schema:
+            $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Version-Type'
+      responses:
+        '101':
+          description: Success case (101 Switching Protocols). The connection has been successfully switched to WebSocket. The response message body is absent.
+          headers:
+            Upgrade:
+              schema:
+                $ref: '#/components/schemas/websocketHeaderUpgrade-Type'
+            Connection:
+              schema:
+                $ref: '#/components/schemas/websocketHeaderConnection-Type'
+            Sec-WebSocket-Accept:
+              schema:
+                $ref: '#/components/schemas/websocketHeader-Sec-WebSocket-Accept-Type'
+        '200':
+          description: Success case (200 OK). The resource identified in the request for retrieval returned in the response message body.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/connectionInfo-Type'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/errorResponse-Type'
+  '/connections/{connectionId}/streams':
+    post:
+      summary: Inform consumer about new reporting streams on an existing connection.
+      description: Allows the producer to add one or more reporting streams to an already established streaming connection.
+      parameters:
+        - name: connectionId
+          in: path
+          description: Indicate the ID (URI) of the connection for which the reporting stream information is being added.
+          required: true
+          schema:
+            $ref: '#/components/schemas/connectionId-Type'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                $ref: '#/components/schemas/streamInfo-Type'
+      responses:
+        '201':
+          description: Success case (201 Posted).
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/streamInfo-Type'
+        '202':
+          description: Partial success case (202 Posted).
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/streamInfo-Type'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/errorResponse-Type'
+    delete:
+      summary: Remove reporting streams from an existing connection
+      description: Allows the producer to remove one or more reporting streams from an already established streaming connection.
+      parameters:
+        - name: connectionId
+          in: path
+          description: Indicate the ID (URI) of the connection for which the reporting stream information is being removed.
+          required: true
+          schema:
+            $ref: '#/components/schemas/connectionId-Type'
+        - name: streamIds
+          in: query
+          description: The list of streamId for the stream(s) to be deleted.
+          required: true
+          schema:
+            type: array
+            items:
+              $ref: '#/components/schemas/streamId-Type'
+      responses:
+        '204':
+          description: Success case (204 No Content). The stream information resource has been deleted. The response message body is absent.
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/errorResponse-Type'
+    get:
+      summary: Obtain information about streams.
+      description: Enables the streaming data reporting service producer to obtain information about one or more reporting streams.
+      parameters:
+        - name: connectionId
+          in: path
+          description: Indicate the ID (URI) of the connection for which the information is being retrieved
+          required: true
+          schema:
+            $ref: '#/components/schemas/connectionId-Type'
+        - name: streamIds
+          in: query
+          description: The list of streamId for which the stream information is to be retrieved.
+          required: true
+          schema:
+            type: array
+            items:
+              $ref: '#/components/schemas/streamId-Type'
+      responses:
+        '200':
+          description: Success case (200 OK).
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/streamInfoWithReporters-Type'
+        '202':
+          description: Partial success case (202 Partially retrieved).
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/streamInfoWithReporters-Type'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/errorResponse-Type'
+  '/connections/{connectionId}/streams/{streamId}':
+    get:
+      summary: Obtain information about stream
+      description: Enables the streaming data reporting service producer to obtain information about a reporting stream.
+      parameters:
+        - name: connectionId
+          in: path
+          description: Indicate the ID (URI) of the connection for which the information is being retrieved
+          required: true
+          schema:
+            $ref: '#/components/schemas/connectionId-Type'
+        - name: streamId
+          in: path
+          description: Indicate the ID of the reporting stream for which the information is being retrieved
+          required: true
+          schema:
+            $ref: '#/components/schemas/streamId-Type'
+      responses:
+        '200':
+          description: Success case (200 OK).
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/streamInfoWithReporters-Type'
+        default:
+          description: Error case.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/errorResponse-Type'
+components:
+  schemas:
+    analyticsInfo-Type:
+      description: Information specific to analytics reporting.
+      type: object
+      properties:
+        activityDetails:
+          type: string
+    connectionId-Type:
+      $ref: '#/components/schemas/uri-Type'
+    connectionInfo-Type:
+      type: object
+      properties:
+        connection:
+          $ref: '#/components/schemas/connectionId-Type'
+        producer:
+          $ref: '#/components/schemas/producerId-Type'
+        streams:
+          type: array
+          items:
+            $ref: '#/components/schemas/streamId-Type'
+    connectionRequest-Type:
+      type: object
+      properties:
+        producer:
+          $ref: '#/components/schemas/producerId-Type'
+        streams:
+          type: array
+          items:
+            $ref: '#/components/schemas/streamInfo-Type'
+    errorResponse-Type:
+      type: object
+      properties:
+        error:
+          type: object
+          properties:
+            errorInfo:
+              type: string
+    failedConnectionResponse-Type:
+      type: object
+      properties:
+        error:
+          type: array
+          items:
+            type: object
+            properties:
+              streamId:
+                $ref: '#/components/schemas/streamId-Type'
+              errorReason:
+                type: string
+    measObjDn-Type:
+      description: DN of the measured object instance (see 3GPP TS 28.550)
+      allOf:
+        - $ref: '#/components/schemas/systemDN-Type'
+    measTypes-Type:
+      description: an ordered list of measurement type or KPI whose measurement values or KPI result values are to be reported by the Performance Data Stream Units (see Annex C of TS 28.550) via this stream
+      type: array
+      items:
+        type: string
+    performanceInfo-Type:
+      description: Information specific to performance data reporting
+      type: object
+      properties:
+        measObjDn:
+          $ref: '#/components/schemas/measObjDn-Type'
+        measTypes:
+          $ref: '#/components/schemas/measTypes-Type'
+        measurementReaderId:
+          $ref: '#/components/schemas/systemDN-Type'
+        jobId:
+          type: string
+      required:
+        - measObjDn
+        - measTypes
+    producerId-Type:
+      description: DN of the streaming data reporting MnS producer.
+      allOf:
+        - $ref: '#/components/schemas/systemDN-Type'
+    serializationFormat-Type:
+      type: string
+      enum:
+        - GPB
+        - ASN1
+    streamId-Type:
+      description: globally unique stream identifier
+      type: string
+      example: '26F452550021'
+    streamInfo-Type:
+      description: Reporting stream meta-data.
+      type: object
+      properties:
+        streamType:
+          $ref: '#/components/schemas/streamType-Type'
+        serializationFormat:
+          $ref: '#/components/schemas/serializationFormat-Type'
+        streamId:
+          oneOf:
+            - $ref: '#/components/schemas/streamId-Type'
+            - $ref: '#/components/schemas/traceReference-Type'
+        additionalInfo:
+          oneOf:
+            - $ref: '#/components/schemas/traceInfo-Type'
+            - $ref: '#/components/schemas/performanceInfo-Type'
+            - $ref: '#/components/schemas/analyticsInfo-Type'
+            - $ref: '#/components/schemas/vsDataContainer-Type'
+      required:
+        - streamType
+        - serializationFormat
+        - streamId
+    streamInfoWithReporters-Type:
+      description: Reporting stream meta-data with added information about reporters.
+      type: object
+      properties:
+        streamInfo:
+          $ref: '#/components/schemas/streamInfo-Type'
+        reporters:
+          type: array
+          items:
+            $ref: '#/components/schemas/producerId-Type'
+    systemDN-Type:
+      description: See 3GPP TS 32.300 for details
+      type: string
+      example: 'SubNetwork=ABCNetwork,SubNetwork=MUC01,GNBDUFunction=XYZ0100'
+    streamType-Type:
+      type: string
+      enum:
+        - TRACE
+        - PERFORMANCE
+        - ANALYTICS
+        - PROPRIETARY
+    traceInfo-Type:
+      description: Information specific to trace data reporting
+      allOf:
+        - $ref: 'genericNrm.yaml#/components/schemas/TraceJob-Attr'
+    traceReference-Type:
+      description: Trace Reference (see clause 5.6 of 3GPP TS 32.422) as stream identifier for streaming trace data reporting
+      type: string
+      example: '4358070034D7'
+    uri-Type:
+      description: Resource URI
+      type: string
+    vsDataContainer-Type:
+      description: container for vendor specific data (see 3GPP TS 28.622)
+      type: object
+      properties:
+        vsDataType:
+          type: string
+        vsData:
+          type: string
+        vsDataFormatVersion:
+          type: string
+    websocketHeaderConnection-Type:
+      description: Header value for the upgrade request and response.
+      type: string
+      enum:
+        - Upgrade
+    websocketHeaderUpgrade-Type:
+      description: Header value for the upgrade to WebSocket request and response.
+      type: string
+      enum:
+        - websocket
+    websocketHeader-Sec-WebSocket-Accept-Type:
+      description: Header value for secure WebSocket response. Carries hash.
+      type: string
+    websocketHeader-Sec-WebSocket-Extensions-Type:
+      description: Header value for secure WebSocket request. Carries protocol extensions.
+      type: string
+    websocketHeader-Sec-WebSocket-Key-Type:
+      description: Header value for secure WebSocket request. Provides information to the server which is needed in order to confirm that the client is entitled to request an upgrade to WebSocket.
+      type: string
+    websocketHeader-Sec-WebSocket-Protocol-Type:
+      description: Header value for secure WebSocket request. Carries a comma-separated list of subprotocol names, in the order of preference.
+      type: string
+    websocketHeader-Sec-WebSocket-Version-Type:
+      description: Header value for secure WebSocket request and response. Carries the WebSocket protocol version to be used.
+      type: string
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/comDefs.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/comDefs.yaml
deleted file mode 100644
index 0528135d2b..0000000000
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/comDefs.yaml
+++ /dev/null
@@ -1,152 +0,0 @@
-openapi: 3.0.1
-info:
-  title: Common Type Definitions
-  version: 16.6.0
-  description: >-
-    OAS 3.0.1 specification of common type definitions in the Generic NRM
-    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
-    All rights reserved.
-externalDocs:
-  description: 3GPP TS 28.623; Generic NRM; Common type definitions
-  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/
-paths: {}
-components:
-  schemas:
-
-    Float:
-      type: number
-      format: float
-    DateTime:
-      type: string
-      format: date-Time
-
-    Dn:
-      type: string
-    DnList:
-      type: array
-      items:
-        $ref: '#/components/schemas/Dn'
-
-    Mcc:
-      type: string
-      pattern: '^[0-9]{3}$'
-    Mnc:
-      type: string
-      pattern: '^[0-9]{2,3}$'
-    PlmnId:
-      type: object
-      properties:
-        mcc:
-          $ref: '#/components/schemas/Mcc'
-        mnc:
-          $ref: '#/components/schemas/Mnc'
-      required:
-        - mcc
-        - mnc
-
-    Fqdn:
-      type: string
-    Uri:
-      type: string
-
-    Ipv4Addr:
-      type: string
-      pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$'
-      example: '198.51.100.1'
-    Ipv6Addr:
-      type: string
-      allOf:
-        - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$'
-        - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$'
-      example: '2001:db8:85a3::8a2e:370:7334'
-    Ipv6Prefix:
-      type: string
-      allOf:
-        - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$'
-        - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$'
-      example: '2001:db8:abcd:12::0/64'
-
-    AdministrativeState:
-      type: string
-      enum:
-        - LOCKED
-        - UNLOCKED
-    OperationalState:
-      type: string
-      enum:
-        - ENABLED
-        - DISABLED
-    UsageState:
-      type: string
-      enum:
-        - IDEL
-        - ACTIVE
-        - BUSY
-
-    AttributeNameValuePairSet:
-      description: >-
-        The key of this map is the attribute name, and the value the attribute value.
-      type: object
-      minProperties: 1
-      additionalProperties:
-        nullable: true
-    AttributeValueChangeSet:
-      description: >-
-        The first array item contains the attribute name value pairs with the new values,
-        and the second array item the attribute name value pairs with the optional old values.
-      type: array
-      items:
-        $ref: '#/components/schemas/AttributeNameValuePairSet'
-        minItems: 1
-        maxItems: 2
-
-    Filter:
-      type: string
-    SystemDN:
-      type: string
-
-    NotificationId:
-      type: integer
-    NotificationType:
-      oneOf:
-        - $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes'
-        - $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes'
-        - $ref: 'perfMnS.yaml#/components/schemas/PerfNotificationTypes'
-        - $ref: 'heartbeatNtf.yaml#/components/schemas/HeartbeatNotificationTypes'
-        # The enum below will be replaced by a reference once notification
-        # types are defined in "FileDataReportingMnS.yaml"
-        - type: string
-          enum:
-            - notifyFileReady
-            - notifyFilePreparationError
-    NotificationHeader:
-      type: object
-      properties:
-        href:
-          $ref: '#/components/schemas/Uri'
-        notificationId:
-          $ref: '#/components/schemas/NotificationId'
-        notificationType:
-          $ref: '#/components/schemas/NotificationType'
-        eventTime:
-          $ref: '#/components/schemas/DateTime'
-        systemDN:
-          $ref: '#/components/schemas/SystemDN'
-      required:
-        - href
-        - notificationId
-        - notificationType
-        - eventTime
-        - systemDN
-
-    ErrorResponse:
-      description: >-
-        Default schema for the response message body in case the request
-        is not successful.
-      type: object
-      properties:
-        error:
-          type: object
-          properties:
-            errorInfo:
-              type: string
diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/perfMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/perfMnS.yaml
deleted file mode 100644
index dec612785a..0000000000
--- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/perfMnS.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-openapi: 3.0.1
-info:
-  title: TS 28.532 Performance Threshold Monitoring MnS
-  version: 16.6.0
-  description: >-
-    OAS 3.0.1 definition of the Performance Threshold Monitoring MnS
-    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
-    All rights reserved.
-externalDocs:
-  description: 3GPP TS 28.532 V16.6.0; Generic management services
-  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/
-servers:
-  - url: '{root}'
-    variables:
-      root:
-        description: >-
-          The open API server of the performance threshold monitoring service is
-          located in the consumer side, see monitoringNotifTarget attribute of
-          the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11].
-        default: http://example.com/3GPPManagement
-paths:
-  /notificationSink:
-    post:
-      summary: Send notifications about performance threshold crossing
-      description: To send a notifyThresholdCrossing notification
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/NotifyThresholdCrossing'
-      responses:
-        '204':
-          description: >-
-            Success case ("204 No Content"). The notification is successfully
-            delivered. The response message body is absent.
-        default:
-          description: Error case.
-          content:
-            application/json:
-              schema:
-                $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
-components:
-  schemas:
-    PerfNotificationTypes:
-      type: string
-      enum:
-        - notifyThresholdCrossing
-    PerfMetricValue:
-      oneOf:
-        - type: integer
-        - $ref: 'comDefs.yaml#/components/schemas/Float'
-    PerfMetricDirection:
-      type: string
-      enum:
-        - UP
-        - DOWN
-    NotifyThresholdCrossing:
-      allOf:
-        - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
-        - type: object
-          properties:
-            observedPerfMetricName:
-              type: string
-            observedPerfMetricValue:
-              $ref: '#/components/schemas/PerfMetricValue'
-            observedPerfMetricDirection:
-              $ref: '#/components/schemas/PerfMetricDirection'
-            thresholdValue:
-              $ref: '#/components/schemas/PerfMetricValue'
-            hysteresis:
-              $ref: '#/components/schemas/PerfMetricValue'
-            monitorGranularityPeriod:
-              type: integer
-            additionalText:
-              type: string
diff --git a/kubernetes/dcaegen2-services/templates/configmap.yaml b/kubernetes/dcaegen2-services/templates/configmap.yaml
index 92662a251e..798f2a7939 100644
--- a/kubernetes/dcaegen2-services/templates/configmap.yaml
+++ b/kubernetes/dcaegen2-services/templates/configmap.yaml
@@ -37,7 +37,7 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common.release" . }}-dcae-external-repo-configmap-sa91-rel16
+  name: {{ include "common.release" . }}-dcae-external-repo-configmap-sa88-rel16
   namespace: {{ include "common.namespace" . }}
 data:
-{{ (.Files.Glob "resources/external/schemas/sa91-rel16/*").AsConfig | indent 2 }}
\ No newline at end of file
+{{ (.Files.Glob "resources/external/schemas/sa88-rel16/*").AsConfig | indent 2 }}
\ No newline at end of file