diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml
index 1740b967a371ac2caa0a88289a33bd79247ec5cf..a48a8c58db5a8da95820bbc956b3ca2b43653882 100644
--- a/OpenAPI/TS28623_TraceControlNrm.yaml
+++ b/OpenAPI/TS28623_TraceControlNrm.yaml
@@ -27,6 +27,30 @@ components:
 
 #-------- Definition of types used in Trace control NRM fragment------------------
                 
+    TraceTarget:
+      type: object
+      description: Trace target conveying both the type and value of the target ID. For additional details see 3GPP TS 32.422
+      properties:
+        traceTargetType:
+          type: string
+          enum:
+            - IMSI
+            - IMEI
+            - IMEISV
+            - PUBLIC_ID
+            - UTRAN_CELL
+            - EUTRAN_CELL
+            - NGRAN_CELL
+            - ENB
+            - RNC
+            - GNB
+            - SUPI
+            - N4_SESSION_ID
+        traceTargetValueList:
+          type: array
+          items:
+            type: string
+
     jobType-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.
@@ -457,28 +481,7 @@ components:
       enum:
         - FILE_BASED
         - STREAMING
-      default: FILE_BASED   
-
-    traceTarget-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
+      default: FILE_BASED
     
     triggeringEvents-Type:
       type: object
@@ -1531,7 +1534,7 @@ components:
         traceReportingFormat:
           $ref: '#/components/schemas/traceReportingFormat-Type'
         traceTarget:
-          $ref: '#/components/schemas/traceTarget-Type'
+          $ref: '#/components/schemas/TraceTarget'
         traceConfig:
           $ref: '#/components/schemas/traceConfig-Type'
         mdtConfig: