diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 2ec6b33ea17a3ce993e723a7b83e2e08d575024c..f69a528c5a9653748bfcaa7955d24898f1f4ec6d 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -25,6 +25,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)" ;
 
+  revision 2025-05-07 { reference "CR-0540" ; }
   revision 2025-02-07 { reference "CR-0504" ; }
   revision 2025-02-05 { reference "CR-0461" ; }
   revision 2024-11-25 { reference "CR-0492" ; } 
@@ -1764,9 +1765,15 @@ module _3gpp-common-trace {
     }
     
     list traceTarget {
-      key "targetIdType targetIdValue";
+      key "targetIdType";
       max-elements 1;
-
+      description "It specifies the target object of the Trace, MDT and 
+        5GC UE level measurements collection. The attribute is applicable for
+        Trace, MDT, and 5GC UE level measurements collection.
+        In case of management based Immediate MDT, RLF reporting, RCEF 
+        reporting or RRC reposring, the traceTarget attribute shall be null 
+        value.";
+      
       leaf targetIdType {
         type enumeration {
           enum IMSI;
@@ -1780,73 +1787,75 @@ module _3gpp-common-trace {
           enum RNC;
           enum GNB;
           enum SUPI;
+          enum N4_SESSION_ID;
         }
-      }
-
-      leaf targetIdValue {
+        description "It specifies the target object of the Trace, MDT and 
+          5GC UE level measurements collection. The attribute is applicable for
+          Trace, MDT, and 5GC UE level measurements collection.
+
+          The targetIdType shall be PUBLIC_ID in case of a Management Based
+          Activation is done to an SCSCFFunction (Serving Call Session Control
+          Function) or PCSCFFunction (Proxy Call Session Control Function) 
+
+          The targetIdType shall be UTRAN_CELL only in case of 
+          UTRAN cell traffic trace function.
+
+          The targetIdType shall be E-UTRAN_CELL only in case of E-UTRAN cell
+          traffic trace function.
+          
+          The targetIdType shall be NG-RAN_CELL only in case of NR cell
+          traffic trace function.
+
+          The targetIdType shall be either IMSI, IMEI or
+          IMEISV if the Trace Session is activated to any of the following
+          ManagedEntity(ies):
+          - HssFunction
+          - MscServerFunction
+          - SgsnFunction
+          - GgsnFunction
+          - BmscFunction
+          - RncFunction
+          - MmeFunction
+          - ServingGWFunction
+          - PGWFunction
+
+          The targetIdType shall be either SUPI or IMEISV if the Trace Session
+          is activated to any of the following ManagedEntity(ies):
+            - AFFunction
+            - AMFFunction
+            - AUSFunction
+            - NEFFunction
+            - NRFFunction
+            - NSSFFunction
+            - PCFFunction
+            - SMFFunction
+            - UPFFunction
+            - UDMFunction
+
+            In case of signalling based MDT, the targetIdType shall be 
+            able to carry PUBLIC_ID, IMSI, IMEI, IMEISV or SUPI.
+
+            In case of management based Logged MDT, the targetIdType 
+            shall carry an eNB or a gNB or an RNC. 
+            The Logged MDT should be initiated on the specified eNB/gNB/RNC in
+            targetIdValueList.
+            
+            In case of signalling based 5GC UE level measurements collection, 
+            the targetIdTypee shall be able to carry IMEISV or SUPI. 
+            
+            In case of management based 5GC UE level measurements collection, 
+            the targetIdType shall be able to carry the corresponding 
+            Measured UE Identifier as defined by the bullet g) of the 5GC UE 
+            level measurements (see TS 28.558) when the TraceJob is created at 
+            the subject ManagedEntity.";
+      }
+
+      leaf-list targetIdValueList {
         type string;
+        description "It specifies the ID value(s) of the target object defined 
+          by traceTargetType";
       }
 
-      description "Specifies the target object of the Trace and MDT. The
-        attribute is applicable for both Trace and MDT. This attribute
-        includes the ID type of the target as an enumeration and the ID value.
-
-        The traceTarget shall be 'PUBLIC_ID' in case of a Management Based
-        Activation is done to an SCSCFFunction (Serving Call 
-        Session Control Function) 
-        or PCSCFFunction (Proxy Call Session Control Function). 
-        The traceTarget shall be 'UTRAN_CELL' only in case of the UTRAN 
-        cell traffic trace function.
-
-        The traceTarget shall be 'E-UTRAN_CELL' only in case of E-UTRAN cell
-        traffic trace function.
-
-        The traceTarget shall be 'NG-RAN_CELL' only in case of NR cell
-        traffic trace function.
-
-        The traceTarget shall be either 'IMSI', 'IMEI' or
-        'IMEISV' if the Trace Session is activated to any of the following
-        ManagedEntity(ies):
-        - HssFunction
-        - MscServerFunction
-        - SgsnFunction
-        - GgsnFunction
-        - BmscFunction
-        - RncFunction
-        - MmeFunction
-        - ServingGWFunction
-        - PGWFunction
-
-        The traceTarget shall be either 'SUPI' or 'IMEISV' if the Trace Session
-        is activated to any of the followed ManagedEntity(ies):
-        - AFFunction
-        - AMFFunction
-        - AUSFFunction
-        - NEFFunction
-        - NRFFunction
-        - NSSFFunction
-        - PCSCFFunction
-        - SMFFunction
-        - UPFFunction
-        - UDMFunction
-
-        In case of signalling based MDT, the traceTarget attribute should
-        be able to carry 'PUBLIC_ID', 'IMSI', 'IMEI', 'IMEISV' or 'SUPI'.
-
-        In case of management based Immediate MDT, the traceTarget attribute 
-        shall be null value. In case of management based Logged MDT, the 
-        traceTarget attribute shall carry an 'eNB' or a 'gNB' or an 'RNC'. 
-        The Logged MDT should be initiated on the specified 
-        eNB/gNB/RNC in traceTarget.  
-        
-        In case of RLF reporting, or RCEF reporting, or RRC reporting, the 
-        traceTarget attribute shall be null value. 
-        
-        In case of signalling based GC UE level measurements collection, 
-        the traceTarget attribute shall be able to carry the corresponding 
-        Measured UE Identifier as defined by the bullet g) of the 5GC UE 
-        level measurements (see TS 28.558) when the TraceJob is created 
-        at the subject ManagedEntity.";
       reference "3GPP TS 32.422";
     }