diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml
index 8d3a24b0a0c99f71e8bb8a5b2a577949ba8b511f..03a753134c71e9c3f5a66cb2269b96ffe1ea9153 100644
--- a/OpenAPI/TS28623_TraceControlNrm.yaml
+++ b/OpenAPI/TS28623_TraceControlNrm.yaml
@@ -13,6 +13,28 @@ paths: {}
 components:
   schemas:
 #-------- 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
+            - E-UTRAN_CELL
+            - NG-RAN_CELL
+            - eNB
+            - RNC
+            - gNB
+            - SUPI
+        traceTargetValueList:
+          type: array
+          items:
+            type: string
                 
     jobType-Type:
       type: string
@@ -413,7 +435,6 @@ components:
       items:
         type: string 
       
-
     traceDepth-Type:
       description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details.
       type: string
@@ -444,27 +465,6 @@ components:
         - 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
     
     triggeringEvents-Type:
       type: object
@@ -1468,7 +1468,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: