diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 176d1fd136febe750e2b220ff059adab31e60113..bd0ae678f1b4fc370d7d03f958298745188043f2 100644
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -245,6 +245,28 @@ components:
       oneOf:
         - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
         - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
+    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
 
 
 #-------- Definition of types used in Trace control NRM fragment------------------
@@ -662,27 +684,6 @@ components:
       enum:
         - FILE-BASED
         - STREAMING
-
-    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
@@ -1476,7 +1477,7 @@ components:
         traceReportingFormat:
           $ref: '#/components/schemas/traceReportingFormat-Type'
         traceTarget:
-          $ref: '#/components/schemas/traceTarget-Type'
+          $ref: '#/components/schemas/TraceTarget'
         triggeringEvents:
           $ref: '#/components/schemas/triggeringEvents-Type'
         anonymizationOfMDTData: