diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index f6522edc47ac1c36d41c394ede7e4e1db57fbfb1..5498129570f82831853ef872de44f8b1958b759c 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -1488,6 +1488,108 @@ components:
       minItems: 0
       maxItems: 255
 
+    traceConfig-Type:
+      description: Trace configuration parameters for NR. See details in 3GPP TS 28.622 clause 4.3.30.
+      type: object
+      properties:
+        listOfInterfaces:
+          $ref: '#/components/schemas/listOfInterfaces-Type'
+        listOfNeTypes:
+          $ref: '#/components/schemas/listOfNeTypes-Type'
+        traceDepth:
+          $ref: '#/components/schemas/traceDepth-Type'
+        triggeringEvents:
+          $ref: '#/components/schemas/triggeringEvents-Type'
+
+    immediateMDTConfig-Type:
+      description: Immediate MDT configuration parameters. See details in 3GPP TS 28.622 clause 4.3.30.
+      type: object
+      properties: 
+        listOfMeasurements:
+          $ref: '#/components/schemas/listOfMeasurements-Type'
+        reportingTrigger:
+          $ref: '#/components/schemas/reportingTrigger-Type'
+        reportAmount:
+          $ref: '#/components/schemas/reportAmount-Type'
+        reportInterval:
+          $ref: '#/components/schemas/reportInterval-Type'
+        eventThreshold:
+          $ref: '#/components/schemas/eventThreshold-Type'
+        collectionPeriodRrmLte:
+          $ref: '#/components/schemas/collectionPeriodRrmLte-Type'
+        collectionPeriodM6Lte:
+          $ref: '#/components/schemas/collectionPeriodM6Lte-Type'
+        collectionPeriodM7Lte:
+          $ref: '#/components/schemas/collectionPeriodM7Lte-Type'
+        collectionPeriodRrmUmts:
+          $ref: '#/components/schemas/collectionPeriodRrmUmts-Type'
+        collectionPeriodRrmNr:
+          $ref: '#/components/schemas/collectionPeriodRrmNr-Type'
+        collectionPeriodM6Nr:
+          $ref: '#/components/schemas/collectionPeriodM6Nr-Type'
+        collectionPeriodM7Nr:
+          $ref: '#/components/schemas/collectionPeriodM7Nr-Type'
+        eventThresholdUphUmts:
+          $ref: '#/components/schemas/eventThresholdUphUmts-Type'
+        measurementPeriodUmts:
+          $ref: '#/components/schemas/measurementPeriodUmts-Type'
+        measurementPeriodLte:
+          $ref: '#/components/schemas/measurementPeriodLte-Type'
+        measurementQuantity:
+          $ref: '#/components/schemas/measurementQuantity-Type'
+        beamLevelMeasurement:
+          $ref: '#/components/schemas/beamLevelMeasurement-Type'
+        positioningMethod:
+          $ref: '#/components/schemas/positioningMethod-Type'
+        excessPacketDelayThresholds:
+          $ref: '#/components/schemas/excessPacketDelayThresholds-Type'
+
+    loggedMDTConfig-Type:
+      description: Logged MDT configuration parameters. See details in 3GPP TS 28.622 clause 4.3.30.
+      type: object
+      properties:
+        traceCollectionEntityId:
+          $ref: '#/components/schemas/traceCollectionEntityId-Type'
+        loggingDuration:
+          $ref: '#/components/schemas/loggingDuration-Type'
+        loggingInterval:
+          $ref: '#/components/schemas/loggingInterval-Type'
+        eventThresholdL1:
+          $ref: '#/components/schemas/eventThresholdL1-Type'
+        hysteresisL1:
+          $ref: '#/components/schemas/hysteresisL1-Type'
+        timeToTriggerL1:
+          $ref: '#/components/schemas/timeToTriggerL1-Type'
+        mbsfnAreaList:
+          type: array
+          items:
+            $ref: '#/components/schemas/MbsfnArea'
+        reportType:
+          $ref: '#/components/schemas/reportType-Type'
+        plmnList:
+          $ref: '#/components/schemas/plmnList-Type'
+        eventListForEventTriggeredMeasurement:
+          $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type'
+        areaConfigurationForNeighCell:
+          $ref: '#/components/schemas/AreaConfig'
+
+    mdtConfig-Type:
+      description: MDT config parameters. See details in 3GPP TS 28.622 clause 4.3.30.
+      type: object
+      properties:
+        anonymizationOfMdtData:
+          $ref: '#/components/schemas/anonymizationOfMdtData-Type'
+        areaScope:
+          type: array
+          items:
+            $ref: '#/components/schemas/AreaScope'
+        sensorInformation:
+          $ref: '#/components/schemas/sensorInformation-Type'
+        immediateMDTConfig:
+          $ref: '#/components/schemas/immediateMDTConfig-Type'
+        loggedMDTConfig:
+          $ref: '#/components/schemas/loggedMDTConfig-Type'
+
 #-------- end of Definition of types used in Trace control NRM fragment ----------
 
 
@@ -1671,18 +1773,12 @@ components:
       properties:
         jobType:
           $ref: '#/components/schemas/jobType-Type'
-        listOfInterfaces:
-          $ref: '#/components/schemas/listOfInterfaces-Type'                  
-        listOfNeTypes:
-          $ref: '#/components/schemas/listOfNeTypes-Type'
         plmnTarget:
           $ref: '#/components/schemas/plmnTarget-Type'
         traceReportingConsumerUri:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
         traceCollectionEntityIpAddress:
           $ref: '#/components/schemas/IpAddr'
-        traceDepth:
-          $ref: '#/components/schemas/traceDepth-Type'
         traceReference:
           $ref: '#/components/schemas/traceReference-Type'
         jobId:
@@ -1691,78 +1787,10 @@ components:
           $ref: '#/components/schemas/traceReportingFormat-Type'
         traceTarget:
           $ref: '#/components/schemas/traceTarget-Type'
-        triggeringEvents:
-          $ref: '#/components/schemas/triggeringEvents-Type'
-        anonymizationOfMdtData:
-          $ref: '#/components/schemas/anonymizationOfMdtData-Type'
-        areaConfigurationForNeighCell:
-          $ref: '#/components/schemas/AreaConfig'
-        areaScope:
-          type: array
-          items:
-            $ref: '#/components/schemas/AreaScope'
-        beamLevelMeasurement:
-          $ref: '#/components/schemas/beamLevelMeasurement-Type'
-        collectionPeriodRrmLte:
-          $ref: '#/components/schemas/collectionPeriodRrmLte-Type'
-        collectionPeriodM6Lte:
-          $ref: '#/components/schemas/collectionPeriodM6Lte-Type'
-        collectionPeriodM7Lte:
-          $ref: '#/components/schemas/collectionPeriodM7Lte-Type'
-        collectionPeriodRrmUmts:
-          $ref: '#/components/schemas/collectionPeriodRrmUmts-Type'
-        collectionPeriodRrmNr:
-          $ref: '#/components/schemas/collectionPeriodRrmNr-Type'
-        collectionPeriodM6Nr:
-          $ref: '#/components/schemas/collectionPeriodM6Nr-Type'
-        collectionPeriodM7Nr:
-          $ref: '#/components/schemas/collectionPeriodM7Nr-Type'
-        eventListForEventTriggeredMeasurement:
-          $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type'
-        eventThreshold:
-          $ref: '#/components/schemas/eventThreshold-Type'
-        listOfMeasurements:
-          $ref: '#/components/schemas/listOfMeasurements-Type'
-        loggingDuration:
-          $ref: '#/components/schemas/loggingDuration-Type'
-        loggingInterval:
-          $ref: '#/components/schemas/loggingInterval-Type'
-        eventThresholdL1:
-          $ref: '#/components/schemas/eventThresholdL1-Type'
-        hysteresisL1:
-          $ref: '#/components/schemas/hysteresisL1-Type'
-        timeToTriggerL1:
-          $ref: '#/components/schemas/timeToTriggerL1-Type'
-        mbsfnAreaList:
-          type: array
-          items:
-            $ref: '#/components/schemas/MbsfnArea'
-        measurementPeriodLte:
-          $ref: '#/components/schemas/measurementPeriodLte-Type'
-        measurementPeriodUmts:
-          $ref: '#/components/schemas/measurementPeriodUmts-Type'
-        measurementQuantity:
-          $ref: '#/components/schemas/measurementQuantity-Type'
-        eventThresholdUphUmts:
-          $ref: '#/components/schemas/eventThresholdUphUmts-Type'
-        plmnList:
-          $ref: '#/components/schemas/plmnList-Type'
-        positioningMethod:
-          $ref: '#/components/schemas/positioningMethod-Type'
-        reportAmount:
-          $ref: '#/components/schemas/reportAmount-Type'
-        reportingTrigger:
-          $ref: '#/components/schemas/reportingTrigger-Type'
-        reportInterval:
-          $ref: '#/components/schemas/reportInterval-Type'
-        reportType:
-          $ref: '#/components/schemas/reportType-Type'
-        sensorInformation:
-          $ref: '#/components/schemas/sensorInformation-Type'
-        traceCollectionEntityId:
-          $ref: '#/components/schemas/traceCollectionEntityId-Type'
-        excessPacketDelayThresholds:
-          $ref: '#/components/schemas/excessPacketDelayThresholds-Type'
+        traceConfig:
+          $ref: '#/components/schemas/traceConfig-Type'
+        mdtConfig:
+          $ref: '#/components/schemas/mdtConfig-Type'
 
     ManagedFunction-ncO:
       type: object