diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 460ea4b21b417a4178973eb99b3604e698991fb7..32d8f89f1816b5970d49363b15f90acd2bf00297 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -24,7 +24,8 @@ module _3gpp-common-trace {
       Generic Network Resource Model (NRM)
       Integration Reference Point (IRP);
       Information Service (IS)" ;
-
+  
+  revision 2025-08-06 { reference "CR-0563" ; }
   revision 2025-05-06 { reference "CR-0531 CR-0535" ; }
   revision 2025-02-06 { reference "CR-0503 CR-0507" ; }
   revision 2025-02-05 { reference "CR-0460" ; }
@@ -114,47 +115,58 @@ module _3gpp-common-trace {
       This <<dataType>> defines an area scope"; 
 
     choice AreaScopeChoice {
-      leaf-list eutraCellIdList {
-        type string;
-        min-elements 1;
-        max-elements 32;
-        description "List of E-UTRAN cells identified by E-UTRAN-CGI";
-      }
-      
-      leaf-list nrCellIdList {
-        type string;
-        min-elements 1;
-        max-elements 32;
-        description "List of NR cells identified by NG-RAN CGI";
+      case eutran-only {
+        leaf-list eutraCellIdList {
+          type string;
+          min-elements 1;
+          max-elements 32;
+          description "List of E-UTRAN cells identified by E-UTRAN-CGI";
+        }
       }
-      
-      leaf-list tacList {
-        type types3gpp:Tac;
-        min-elements 1;
-        max-elements 8;
-        description "Tracking Area Code list";
+      case tac {
+        leaf-list tacList {
+          type types3gpp:Tac;
+          min-elements 1;
+          max-elements 8;
+          description "Tracking Area Code list";
+        }
+        leaf-list cAGIdList {
+          type string;
+          max-elements 256;
+          description "It identifies a CAG list containing up to 
+            256 CAG-identifiers per UE or up to 12 CAG-identifiers 
+            per cell, see TS 38.331 [38]. CAG ID is used to combine 
+            with PLMN ID to identify a PNI-NPN.AG ID is a hexadecimal 
+            range with size 32 bit.";
+        }
       }
-      
-      list taiList {
-        description "Tracking Area Identity list";
-        key idx;
-        min-elements 1;
-        max-elements 8;
-        leaf idx { type string; }
-        uses types3gpp:TaiGrp;
+      case else {
+        list nPNIdentityList {
+          description "list of NPN IDs of in NR. It is either 
+            a list of PNI-NPNs identified by CAG ID with 
+            associated plmn-Identity or a list of SNPN 
+            identified by Network ID with associated plmn-Identity";
+          key idx;
+          min-elements 1;
+          uses types3gpp:NpnIdGrp;
+          leaf idx { type string; }
+        }
+        leaf-list nrCellIdList {
+          must 'not(../taiList)';
+          type string;
+          max-elements 32;
+          description "List of NR cells identified by NG-RAN CGI";
+        }
+        list taiList {
+          must 'not(../nrCellIdList)';
+          description "Tracking Area Identity list";
+          key idx;
+          max-elements 8;
+          leaf idx { type string; }
+          uses types3gpp:TaiGrp;
+        }
       }
     }
-
-    list nPNIdentityList {
-      description "It defines which NPNs that can be served by the NR cell, 
-        and which CAG IDs or NIDs can be supported by the NR cell for 
-        corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell.
-        (NPN-Identity referring to TS 38.331).";
-      key idx;
-      min-elements 1;
-      uses NpnIdGrp;
-      leaf idx { type string; }
-    }
   }
   
   grouping NpnIdGrp {
diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang
index e8bd963e1b98c392c1b151e0c49371b99b0c10a9..0e6b88255e129fb2a5f2171dccc1dc4639c06398 100755
--- a/yang-models/_3gpp-common-yang-types.yang
+++ b/yang-models/_3gpp-common-yang-types.yang
@@ -16,6 +16,7 @@ module _3gpp-common-yang-types {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623";
 
+  revision 2025-08-06 { reference CR-0563; }
   revision 2025-02-18 { reference CR-0511; } 
   revision 2025-02-06 { reference CR-0507; } 
   revision 2024-05-18 { reference CR-0359; } 
@@ -277,6 +278,47 @@ module _3gpp-common-yang-types {
       yext3gpp:notNotifyable;
     }
   }
+
+    grouping NpnIdGrp {
+    description "Represents the NPN supported by the <<IOC>> using this 
+      <<dataType>> as one of its attributes in case of the cell is a 
+      NPN-only cell.";
+      
+    list plmnId {
+      key "mcc mnc";
+      min-elements 1;
+      description "It specifies the PLMN Id of the NPN network.";
+      uses types3gpp:PLMNId;
+    }
+   
+    choice npnidChoice {
+      leaf-list cAGIdList {
+        type string {
+          pattern '^[A-Fa-f0-9]{8}$';
+        }
+        max-elements 256;
+        description "It identifies a CAG list containing up to 12 
+          CAG-identifiers per Ue or up to 12 CAG-identifiers per cell, 
+          see TS 38.331.
+          CAG ID is used to combine with PLMN ID to identify a PNI-NPN.CAG ID is
+          a hexadecimal range with size 32 bit";
+      }
+     
+      leaf-list nIDList {
+        type string {
+          pattern '^[A-Fa-f0-9]{11}$';
+        }
+        max-elements 16;
+        description "It identifies a list of NIDs containing up to 16 NIDs, see
+        TS 38.331. NID is used to combine with PLMN ID to identify an SNPN.
+        NID is a hexadecimal range with size 44 bit.";
+      }
+    }
+  }
+  
+
+
+  
   
   typedef TenthOfDegrees { 
     type uint16 {