diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang
index 836f47ae7024eb4aa218125f15e146225934372d..72cd21c1476108e6f644f02141450519166912e2 100644
--- a/yang-models/_3gpp-common-filemanagement.yang
+++ b/yang-models/_3gpp-common-filemanagement.yang
@@ -8,6 +8,7 @@ module _3gpp-common-filemanagement {
   import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
+  import ietf-inet-types { prefix inet; }
    
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -17,6 +18,7 @@ module _3gpp-common-filemanagement {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";
 
+  revision 2024-11-07 { reference CR-0472 ; }
   revision 2023-12-17 { reference CR-0327 ; } 
   revision 2023-09-17 { reference CR-0270 ; } 
   revision 2022-10-31 { reference CR-0195;   }
@@ -52,12 +54,23 @@ module _3gpp-common-filemanagement {
     uses top3gpp:Top_Grp;
     
     leaf fileLocation {
-      description "Provides the location of a file.
-        allowedValues:  File URI (See RFC 8089)";
+      type inet:uri ;
       mandatory true;
-      type string;
-      yext3gpp:notNotifyable;
-      yext3gpp:inVariant;
+      yext3gpp:notNotifyable ;
+      yext3gpp:inVariant ;
+      description "Location of the file incl. the file transfer protocol, 
+        and the file name for the case the file content cannot be retrieved 
+        by reading the 'fileContent' attribute.
+        
+        The allowed file transfer protocols are:
+        - sftp
+        - ftpes
+        - https
+        
+        Examples:
+        'sftp://companyA.com/datastore/fileName.xml',
+        'https://companyA.com/ManagedElement=1/Files=1/File=1'
+        ";
     }
     
     leaf notificationRecipientAddress {
diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang
index 3940a8596328addd1b8d8fccaf8fbe50e620bc54..8a5da660b88576b743076cb1b7f2aa59ff35ae36 100755
--- a/yang-models/_3gpp-common-measurements.yang
+++ b/yang-models/_3gpp-common-measurements.yang
@@ -57,6 +57,7 @@ module _3gpp-common-measurements {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2024-11-05 { reference CR-0486; } 
   revision 2024-02-23 { reference CR-0347; } 
   revision 2024-01-29 { reference "CR-0327"; }
   revision 2023-11-17 { reference "CR-0298"; }
@@ -179,6 +180,7 @@ module _3gpp-common-measurements {
   grouping SupportedPerfMetricGroupGrp {
     list SupportedPerfMetricGroups {
       config false;
+      key idx;
       description "Captures a group of supported performance metrics and
         associated parameters related to their production and reporting.
         A SupportedPerfMetricGroup attribute which is part of an MOI may
@@ -187,6 +189,8 @@ module _3gpp-common-measurements {
         can specify supported metrics for contained ManagedFunctions
         like a GNBDUFunction.";
 
+      leaf idx { type uint32; }
+        
       leaf-list performanceMetrics {
         type string;
         min-elements 1;
diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 8f2546ba282a8c895f6e184f7b41b5f6d5ae8d2e..a495a9b4ace90a3416e375f04c2371795b273ff9 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -26,6 +26,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2024-11-05 { reference "CR-0469" ; }
   revision 2024-08-09 { reference "CR-0419" ; }
   revision 2024-05-13 { reference "CR-0360" ; }
   revision 2024-04-05 { reference "CR-0341" ; }
@@ -606,22 +607,22 @@ module _3gpp-common-trace {
         ManagedEntity playing a role of ServinGWFunction.
 
         In case of signaling based Trace/MDT, the traceTarget attribute shall 
-        be able to carry (IMSI or IMEI(SV)or SUPI), the MDTAreaScope attribute 
+        be able to carry (IMSI or IMEI(SV)or SUPI), the areaScope attribute 
         shall be able to carry a list of (cell or E-UtranCell or NRCellDU or 
         TA/LA/RA).
 
         In case of management based Immediate MDT, the traceTarget attribute
-        shall be null value, the MDTAreaScope attribute shall carry a list of
+        shall be null value, the areaScope attribute shall carry a list of
         (Utrancell or E-UtranCell or NRCellDU).
 
         In case of management based Logged MDT, the traceTarget attribute
         shall carry an eBs or a RNC or gNBs. The Logged MDT should be initiated 
-        on the specified eNB or RNC or gNB in traceTarget. The MDTAreaScope 
+        on the specified eNB or RNC or gNB in traceTarget. The areaScope 
         attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU or 
         TA/LA/RA).
 
         In case of RLF reporting, or RCEF reporting,  the traceTarget 
-        attribute shall be null value, the MDTAreaScope attribute shall carry 
+        attribute shall be null value, the areaScope attribute shall carry 
         one or list of eNBs/gNBs";
       reference "3GPP TS 32.422";
     }
@@ -674,23 +675,11 @@ module _3gpp-common-trace {
     }
 
     list areaScope {
-      description "specifies MDT area scope when activates an MDT job.
-
-      For RLF and RCEF reporting it specifies the eNB or list of eNBs where the
-      RLF or RCEF reports should be collected.
-
-
-      List of cells/TA/LA/RA for signaling based MDT or management based Logged
-      MDT.
-
-      List of cells for management based Immediate MDT.
-
-      Cell, TA, LA, RA are mutually exclusive.
-
-      One or list of eNBs for RLF and RCEFreporting";
-      reference "Clause 5.10.2 of 3GPP TS 32.422";
+      description "it specifies the area where data shall be collected.";
 
       key idx;
+      min-elements 0;
+      max-elements 1;
       leaf idx {type string; }
       uses AreaScopeGrp;   
     }