diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
index a4724bf4e5e3b7468f1fcbd3ad4f352b12b1595e..e951d0cf2e7821f0d6e307db3da79ab005fcdf0e 100755
--- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
+++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
@@ -19,8 +19,7 @@ in 3GPP TS 23.501.
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
-  revision 2023-09-18 { reference CR-1043 ; } 
-  revision 2023-04-26 { reference CR-0916; }
+  revision 2023-09-24 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
   revision 2020-08-03 { reference "CR-0321"; }
   revision 2020-04-10 { reference "S5-202101";   }
diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang
index d9b5afa663bd2a523b1d14319f6660f8d4aa57fb..0a78825ae24aab56bb1ce9db30bb71e326ad2832 100644
--- a/yang-models/_3gpp-common-filemanagement.yang
+++ b/yang-models/_3gpp-common-filemanagement.yang
@@ -18,7 +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-0473 ; }
+  revision 2024-11-12 { reference CR-0473 ; }
   revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-02-14 { reference CR-0234; }
   revision 2022-10-24 { reference CR-0196;  }
diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang
index 9317e769fee47aff7c2d02622f000e10b3b99ecd..3a4ba43dcbeafffc4253e8f33491e29993c73059 100644
--- a/yang-models/_3gpp-common-files.yang
+++ b/yang-models/_3gpp-common-files.yang
@@ -25,7 +25,7 @@ module _3gpp-common-files {
       Integration Reference Point (IRP);
       Information Service (IS)";
   
-  revision 2024-05-11 { reference CR-0362 ; } 
+  revision 2024-05-12 { reference CR-0362 ; } 
   revision 2023-09-18 { reference CR-0271 ; } 
   revision 2022-09-28 { reference CR-0191; }
   
diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang
index e04577d77215145d5189fa5c2ac227a57bf6882d..a1c17734b7a65ca18bb540ca9c97b91f717e7831 100755
--- a/yang-models/_3gpp-common-measurements.yang
+++ b/yang-models/_3gpp-common-measurements.yang
@@ -43,7 +43,7 @@ module _3gpp-common-measurements {
 
     Measurements can be contained under ManagedElement, SubNetwork, or
     any list representing a class inheriting from Subnetwork or
-    ManagedFunction. Note: KPIs will only be supported under SubNetwork
+    ManagedFunction. 
     Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
@@ -56,6 +56,7 @@ module _3gpp-common-measurements {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2025-05-18 { reference CR-0531; }
   revision 2025-02-05 { reference CR-0460; }
   revision 2025-01-28 { reference CR-0511; } 
   revision 2024-11-06 { reference CR-0487; } 
diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang
index 29ffa4c8f97a53b3b0ff7b02a26ea34dfdfe1070..784cba09cde1cb52751b7d9ab2d5454801160545 100755
--- a/yang-models/_3gpp-common-subscription-control.yang
+++ b/yang-models/_3gpp-common-subscription-control.yang
@@ -19,7 +19,7 @@ module _3gpp-common-subscription-control {
       Solution Set (SS) definitions
       3GPP TS 28.623";
   
-  revision 2025-03-24 { reference CR-0517 ; } 
+  revision 2025-03-30 { reference CR-0517 ; } 
   revision 2024-05-18 { reference CR-0359 ; } 
   revision 2024-01-18 { reference "CR-0309 CR-0329" ; } 
   revision 2023-09-18 { reference CR-0271 ; } 
diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index b19385705281ff2561c499abe8f407ad078e438b..edb7e76329dc135eb10a3120c560644a56ec3446 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-06 { reference "0531" ; }
   revision 2025-02-06 { reference "CR-0503 CR-0507" ; }
   revision 2025-02-05 { reference "CR-0460" ; }
   revision 2024-11-05 { reference "CR-0470" ; }
@@ -1761,7 +1762,6 @@ module _3gpp-common-trace {
       type string;
       yext3gpp:inVariant;
       description "Identifier of a TraceJob";
-      yext3gpp:inVariant;
     }
 
     leaf traceReportingFormat {
diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang
index d0afa896a0b344c48d377034a81cd083c922a14e..884fcadfa93fbd68c045456a89f86ab7e84ca164 100755
--- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang
@@ -3,45 +3,49 @@ module _3gpp-nr-nrm-danrmanagementfunction {
   namespace "urn:3gpp:sa5:_3gpp-nr-nrm-danrmanagementfunction";
   prefix "danrmanagementfunction3gpp";
 
-
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
 
- 
-
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "Defines the YANG mapping of the DANRManagementFunction Information Object Class
-    (IOC) that is part of the NR Network Resource Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+  description "Defines the YANG mapping of the DANRManagementFunction IOC
+    that is part of the NR Network Resource Model (NRM).
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-05-06 { reference "CR-1526 CR-1527" ; }  // common for R18, R19
+  revision 2024-08-19 { reference CR-1314 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2020-05-08 { reference S5-203316; }
 
-
   grouping DANRManagementFunctionGrp {
     description "Represents the DANRManagementFunction IOC.";
-    reference "3GPP TS 28.541";
-    uses top3gpp:Top_Grp;
 
     leaf intrasystemANRManagementSwitch {
-        description "This attribute determines whether the intra-system ANR function is activated or deactivated.";
+      description "This attribute determines whether the intra-system ANR 
+        function is activated or deactivated.";
          type boolean;
     }
 
     leaf intersystemANRManagementSwitch {
-        description "This attribute determines whether the inter-system ANR function is activated or deactivated.";
+      description "This attribute determines whether the inter-system ANR 
+        function is activated or deactivated.";
         type boolean;
     }
-
-    
   }
 
   augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" {
-    if-feature gnbcucp3gpp:DANRManagementFunction;
+    list DANRManagementFunction {
+      description "This IOC contains attributes to support the D-SON function 
+        of ANR Management (See clause 6.4.1.3 in TS 28.313 .";
+      key id;   
+      max-elements 1;
+      uses top3gpp:Top_Grp;
+      container attributes {
     uses DANRManagementFunctionGrp;
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 81519e61ceb2b979bafeee7c2006e6198e2ded5f..f971ade817c4f9222d6f7188a9c993d1cf004c02 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -9,11 +9,12 @@ module _3gpp-nr-nrm-ecmappingrule {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the unified mapping rule input to support
     Energy Cost Index Mapping when Energy Cost Reporting.
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
-  revision 2024-08-12 { reference CR-1336 ; } 
+  revision 2025-05-06 { reference "CR-1526 CR-1527" ; }  // common for R18, R19
+  revision 2024-08-12 { reference "CR-1336 CR-1337"; } 
   
   grouping NRECMappingRuleGrp {
     description "Represents the unified mapping rule to support Energy Cost Mapping 
@@ -43,12 +44,16 @@ module _3gpp-nr-nrm-ecmappingrule {
   grouping NRECMappingRuleSubtree {
     description "Helps augmenting NRECMappingRule into multiple places.";
     list NRECMappingRule {
-      description "The mapping rule.";
+      description "Represents the unified mapping rule, applicable for the 
+        group of gNBs (within a certain area), for the calculation of the 
+        energy cost (see TS 34.423). 
+        
+        NRECMappingRule can be name-contained by SubNetwork or ManagedElement. 
+        It applies to all ManagedEntity contained by the parent.";
       key id;
       uses top3gpp:Top_Grp;
       min-elements 1;
       max-elements 1;
-      leaf idx { type uint32; }
       container attributes {
         uses NRECMappingRuleGrp;  
       }
diff --git a/yang-models/_3gpp-nr-nrm-ep.yang b/yang-models/_3gpp-nr-nrm-ep.yang
index 927bc49b110c13525092999f115c3ca6a56236f0..1bad0c7ffa0d6dd30c4f4127a3e93e9e9a56ebbb 100755
--- a/yang-models/_3gpp-nr-nrm-ep.yang
+++ b/yang-models/_3gpp-nr-nrm-ep.yang
@@ -15,10 +15,11 @@ module _3gpp-nr-nrm-ep {
   description "Defines the YANG mapping of the NR related endpoint
     Information Object Classes (IOCs) that are part of the NR Network
     Resource Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-05-06 { reference "CR-1526 CR-1527" ; }  // common for R18, R19
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0643; }
   revision 2021-05-01 { reference CR-0490; }
@@ -46,16 +47,30 @@ module _3gpp-nr-nrm-ep {
     uses eprp3gpp:EP_Common;
   }
 
-  grouping EP_F1CGrp {
-    description "Represents the EP_F1C IOC.";
-    reference "3GPP TS 28.541, 3GPP TS 38.470";
-    uses eprp3gpp:EP_Common;
+  grouping EP_F1CSubtree {
+    list EP_F1C {
+      description "Represents the local end point of the control plane
+        interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP.";
+      reference "3GPP TS 28.541, 3GPP TS 38.470";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {    
+        uses eprp3gpp:EP_Common;
+      }
+    }
   }
 
-  grouping EP_F1UGrp {
-    description "Represents the EP_F1U IOC.";
-    reference "3GPP TS 28.541, 3GPP TS 38.470";
-    uses eprp3gpp:EP_Common;
+  grouping EP_F1USubtree {
+    list EP_F1U {
+      description "Represents the local end point of the user plane
+        interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP.";
+      reference "3GPP TS 28.541, 3GPP TS 38.470";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {    
+        uses eprp3gpp:EP_Common;
+      }
+    }
   }
 
   grouping EP_XnCGrp {
@@ -114,16 +129,7 @@ module _3gpp-nr-nrm-ep {
       }
     }
 
-    list EP_F1C {
-      description "Represents the local end point of the control plane
-        interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP.";
-      reference "3GPP TS 28.541, 3GPP TS 38.470";
-      key id;
-      uses top3gpp:Top_Grp;
-      container attributes {    
-        uses EP_F1CGrp;
-      }
-    }
+    uses EP_F1CSubtree;
 
     list EP_NgC {
       description "Represents the local end point of the control plane
@@ -176,16 +182,7 @@ module _3gpp-nr-nrm-ep {
       }
     }
 
-    list EP_F1U {
-      description "Represents the local end point of the user plane
-        interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP.";
-      reference "3GPP TS 28.541, 3GPP TS 38.470";
-      key id;
-      uses top3gpp:Top_Grp;
-      container attributes {    
-        uses EP_F1UGrp;
-      }
-    }
+    uses EP_F1USubtree;
 
     list EP_NgU {
       description "Represents the local end point of the NG user plane
@@ -236,26 +233,12 @@ module _3gpp-nr-nrm-ep {
   augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" {
     if-feature EPClassesUnderGNBDUFunction;
 
-    list EP_F1C {
-      description "Represents the local end point of the control plane
-        interface (F1-C) between the DU and CU or CU-CP.";
-      reference "3GPP TS 28.541, 3GPP TS 38.470";
-      key id;
-      uses top3gpp:Top_Grp;
-      container attributes {    
-        uses EP_F1CGrp;
+    uses EP_F1CSubtree {
+      refine EP_F1C {
+        max-elements 1;
       }
     }
 
-    list EP_F1U {
-      description "Represents the local end point of the user plane
-        interface (F1-U) between the DU and CU or CU-UP.";
-      reference "3GPP TS 28.541, 3GPP TS 38.470";
-      key id;
-      uses top3gpp:Top_Grp;
-      container attributes {    
-        uses EP_F1UGrp;
-      }
-    }
+    uses EP_F1USubtree;
   }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-eutranetwork.yang b/yang-models/_3gpp-nr-nrm-eutranetwork.yang
index 3958b9c1a2350463faadd44093c3d56be03bf371..2448d72f5f2b9fa968d3a15fe5d9a3f00cf5f794 100755
--- a/yang-models/_3gpp-nr-nrm-eutranetwork.yang
+++ b/yang-models/_3gpp-nr-nrm-eutranetwork.yang
@@ -3,61 +3,34 @@ module _3gpp-nr-nrm-eutranetwork {
   namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranetwork";
   prefix "eutranet3gpp";
 
-  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
 
   organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the EUtraNetwork Information Object
     Class (IOC) that is part of the NR Network Resource Model (NRM).
     Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
   revision 2023-09-18 { reference CR-1043 ; } 
-  revision 2019-06-17 {
-    description "Initial revision";
-  }
-
-  feature ExternalsUnderEUtraNetwork {
-    description "Classes representing external entities like EUtranFrequency, 
-      ExternalENBFunction are contained under a EUtraNetwork list/class.";
-  }
+  revision 2019-06-17 {reference "Initial revision"; }
 
   grouping EUtraNetworkGrp {
-    description "Represents the EUtraNetwork IOC.";
-    reference "3GPP TS 28.541";
-    uses subnet3gpp:SubNetworkGrp;
+    description "Represents the EUtraNetwork IOC.
+      Contains no additiona attributes.";
   }
 
-  list EUtraNetwork {
-    description "A subnetwork containing gNB external E-UTRAN entities.";
-      reference "3GPP TS 28.541";
-    key id;
-    uses top3gpp:Top_Grp;
-    container attributes {
-      uses EUtraNetworkGrp;
-      leaf-list parents {
-        description "Reference to all containg EUtraNetwork instances 
-          in strict order from the root EUtraNetwork down to the immediate 
-          parent EUtraNetwork.
-          If EUtraNetworks form a containment hierarchy this is 
-          modeled using references between the child EUtraNetwork and the parent 
-          EUtraNetworks. 
-          This reference MUST NOT be present for the top level EUtraNetwork and 
-          MUST be present for other EUtraNetworks.";
-        type leafref {
-          path "../../../EUtraNetwork/id";  
-        } 
-      }
-      
-      leaf-list containedChildren{
-        description "Reference to all directly contained EUtraNetwork instances.
-          If EUtraNetworks form a containment hierarchy this is 
-          modeled using references between the child EUtraNetwork and the parent 
-          EUtraNetwork.";
-        type leafref {
-          path "../../../EUtraNetwork/id";  
-        } 
+  augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction {  
+    list EUtraNetwork {
+      description "A subnetwork containing gNB external E-UTRAN entities.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EUtraNetworkGrp;
       }
     }
   }
diff --git a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang
index 0698485b4d510c123828444091ff53f079338b02..eebe52d4af8242c48fe2bb37bdd7ebfa86e3ad50 100755
--- a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang
+++ b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang
@@ -3,29 +3,29 @@ module _3gpp-nr-nrm-eutranfrequency {
   namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranfrequency";
   prefix "eutraneteutranfreq3gpp";
 
-  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
   import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
 
   organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the EUtranFrequency Information
     Object Class (IOC), that is part of the NR Network Resource Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM),
     3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)";
 
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
-  revision 2019-06-17 {
-    description "Initial revision";
-  }
+  revision 2019-06-17 { reference "Initial revision"; }
 
   grouping EUtranFrequencyGrp {
     description "Represents the EUtranFrequency IOC.";
     reference "3GPP TS 28.541";
-    uses mf3gpp:ManagedFunctionGrp;
 
     leaf earfcnDL {
       description "Specifies the channel number for the central DL frequency.";
@@ -51,17 +51,25 @@ module _3gpp-nr-nrm-eutranfrequency {
       container attributes {
         uses EUtranFrequencyGrp;
       }
-      uses mf3gpp:ManagedFunctionContainedClasses;
     }
   } 
   
+  feature ExternalENBFunctionUnderSubNetwork {
+    description "The ExternalENBFunction shall be contained under SubNetwork";
+  }
+  
   augment "/subnet3gpp:SubNetwork" {
-    if-feature subnet3gpp:ExternalsUnderSubNetwork ;
+    if-feature ExternalENBFunctionUnderSubNetwork ;
     uses EUtranFrequencyWrapper ;
   }
 
-  augment "/eutranet3gpp:EUtraNetwork" {
-    if-feature eutranet3gpp:ExternalsUnderEUtraNetwork;
+  feature ExternalENBFunctionUnderEUtraNetwork {
+    description "The ExternalENBFunction shall be contained under EUtraNetwork";
+  }
+  
+  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" 
+      + "eutranet3gpp:EUtraNetwork" {
+    if-feature ExternalENBFunctionUnderEUtraNetwork;
     uses EUtranFrequencyWrapper ;
   }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-externalamffunction.yang b/yang-models/_3gpp-nr-nrm-externalamffunction.yang
index eb0547390186355c4379e44eddf9611bc6261a95..f74c5d3a04d2f8dff5681cf01171c453b171b841 100755
--- a/yang-models/_3gpp-nr-nrm-externalamffunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalamffunction.yang
@@ -5,26 +5,24 @@ module _3gpp-nr-nrm-externalamffunction {
     
   import _3gpp-common-managed-function { prefix mf3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
-  import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-yang-types { prefix types3gpp; }
 
   organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the ExternalAMFFunction Information
     Object Class (IOC) that is part of the NR Network Resource Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
-  revision 2019-06-17 {
-    description "Initial revision";
-  }
+  revision 2019-06-17 { reference "Initial revision"; }
 
   grouping ExternalAMFFunctionGrp {
     description "Represents the ExternalAMFFunction IOC.";
-    reference "3GPP TS 28.541";
     uses mf3gpp:ManagedFunctionGrp;
 
     list pLMNIdList {
@@ -61,12 +59,6 @@ module _3gpp-nr-nrm-externalamffunction {
   } 
   
   augment "/subnet3gpp:SubNetwork" {
-    if-feature subnet3gpp:ExternalsUnderSubNetwork ;
-    uses ExternalAMFFunctionWrapper;
-  }
-
-  augment "/nrnet3gpp:NRNetwork" {
-    if-feature nrnet3gpp:ExternalsUnderNRNetwork;
     uses ExternalAMFFunctionWrapper;
   }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang
index cdb1611c40bfeef76913b9d245199f854106b9e8..ed8cb66832f6c068cba0ba5258f5109c486d0196 100755
--- a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang
@@ -4,24 +4,27 @@ module _3gpp-nr-nrm-externalenbfunction {
   prefix "extenb3gpp";
 
   import _3gpp-common-managed-function { prefix mf3gpp; }
-  import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
+  import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; }
+  import _3gpp-nr-nrm-externaleutrancell { prefix exteutrancell3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
 
   organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the ExternalENBFunction
     Information Object Class (IOC) that is part of the NR Network Resource
     Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM),
     3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)";
 
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
-  revision 2019-06-17 {
-    description "Initial revision";
-  }
+  revision 2019-06-17 { reference "Initial revision"; }
 
   grouping ExternalENBFunctionGrp {
     description "Represets the ExternalENBFunction IOC.";
@@ -48,16 +51,29 @@ module _3gpp-nr-nrm-externalenbfunction {
         uses ExternalENBFunctionGrp;
       }
       uses mf3gpp:ManagedFunctionContainedClasses;
+      uses exteutrancell3gpp:ExternalEUtranCellFDDSubtree;
+      uses exteutrancell3gpp:ExternalEUtranCellTDDSubtree;
     }
   } 
   
+  feature ExternalENBFunctionUnderSubNetwork {
+    description "The ExternalENBFunction shall be contained under
+      SubNetwork";
+  }
+  
   augment "/subnet3gpp:SubNetwork" {
-    if-feature subnet3gpp:ExternalsUnderSubNetwork ;
+    if-feature ExternalENBFunctionUnderSubNetwork ;
     uses ExternalENBFunctionWrapper;
   }
 
-  augment "/eutranet3gpp:EUtraNetwork" {
-    if-feature eutranet3gpp:ExternalsUnderEUtraNetwork;
+  feature ExternalENBFunctionUnderEUtraNetwork {
+    description "The ExternalENBFunction shall be contained under
+      EUtraNetwork";
+  }
+  
+  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/"
+        + "eutranet3gpp:EUtraNetwork" {
+    if-feature ExternalENBFunctionUnderEUtraNetwork;
     uses ExternalENBFunctionWrapper;
   }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang
index d3306bc8ce628b5ba38d3da3b088a107eb79e759..2a5ff1f39515f21ae4a634cd8d394992f85b5b65 100755
--- a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang
+++ b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang
@@ -5,25 +5,22 @@ module _3gpp-nr-nrm-externaleutrancell {
 
   import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-common-managed-function { prefix mf3gpp; }
-  import _3gpp-common-subnetwork { prefix subnet3gpp; }
-  import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; }
-  import _3gpp-nr-nrm-externalenbfunction { prefix extenb3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
 
   organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the ExternalEUtranCellFDD and
     ExternalEUtranCellTDD Information Object Classes (IOCs) that are part
     of the NR Network Resource Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM),
     3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)";
 
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
-  revision 2019-06-17 {
-    description "Initial revision";
-  }
+  revision 2019-06-17 { reference "Initial revision"; }
 
   grouping ExternalEUtranGenericCellGrp {
     description "Represents the ExternalEUtranGenericCell IOC."; 
@@ -106,7 +103,7 @@ module _3gpp-nr-nrm-externaleutrancell {
     }
   }
 
-  grouping ExternalEUtranCellFDDWrapper {
+  grouping ExternalEUtranCellFDDSubtree {
     list ExternalEUtranCellFDD {
       description "Represents the common properties of external E-UTRAN FDD
         cell provided by eNB or NG-RAN FDD cell provided by ng-eNB.";
@@ -120,7 +117,7 @@ module _3gpp-nr-nrm-externaleutrancell {
     }
   }
 
-  grouping ExternalEUtranCellTDDWrapper {
+  grouping ExternalEUtranCellTDDSubtree {
     list ExternalEUtranCellTDD {
       description "Represents the common properties of external E-UTRAN cell
         TDD provided by eNB or NG-RAN TDD cell provided by ng-eNB.";
@@ -133,24 +130,4 @@ module _3gpp-nr-nrm-externaleutrancell {
       uses mf3gpp:ManagedFunctionContainedClasses;
     }
   }
-
-  augment "/subnet3gpp:SubNetwork/extenb3gpp:ExternalENBFunction" {
-    if-feature subnet3gpp:ExternalsUnderSubNetwork;
-    uses ExternalEUtranCellFDDWrapper;
-  }
-
-  augment "/eutranet3gpp:EUtraNetwork/extenb3gpp:ExternalENBFunction" {
-    if-feature eutranet3gpp:ExternalsUnderEUtraNetwork;
-    uses ExternalEUtranCellFDDWrapper;
-  }
-  
-  augment "/subnet3gpp:SubNetwork/extenb3gpp:ExternalENBFunction" {
-    if-feature subnet3gpp:ExternalsUnderSubNetwork;
-    uses ExternalEUtranCellTDDWrapper;
-  }
-
-  augment "/eutranet3gpp:EUtraNetwork/extenb3gpp:ExternalENBFunction" {
-    if-feature eutranet3gpp:ExternalsUnderEUtraNetwork;
-    uses ExternalEUtranCellTDDWrapper;
-  }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
index 6c295a4040a94b75fc73c9da68c6d208422733b4..b32301bdec55ad3c0d0c4656f9ea1822f03682ea 100755
--- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang
@@ -5,40 +5,44 @@ module _3gpp-nr-nrm-externalgnbcucpfunction {
 
   import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
   import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-nr-nrm-externalnrcellcu { prefix extnrcellcu3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
 
   organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the ExternalGNBCUCPFunction
     Information Object Class (IOC), that is part of the NR Network Resource
     Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
-  revision 2019-06-17 {
-    description "Initial revision";
-  }
+  revision 2019-06-17 { reference "Initial revision"; }
 
   grouping ExternalGNBCUCPFunctionGrp {
     description "Represets the ExternalGNBCUCPFunction IOC.";
-    reference "3GPP TS 28.541";
     uses mf3gpp:ManagedFunctionGrp;
 
     leaf gNBId {
-      description "Identifies a gNB within a PLMN.";
-      reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID
-        in 3GPP TS 38.413";
+      description "Identifies a gNB within a PLMN. 
+        The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells.
+
+        See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. 
+        See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
       mandatory true;
-      type int64 { range "0..4294967295"; }
+      type uint32 { range "0..4294967295"; }
     }
 
     leaf gNBIdLength {
       description "Indicates the number of bits for encoding the gNB ID.";
-      reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413";
+      reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
       mandatory true;
       type int32 { range "22..32"; }
     }
@@ -57,23 +61,35 @@ module _3gpp-nr-nrm-externalgnbcucpfunction {
     list ExternalGNBCUCPFunction {
       description "Represents the properties, known by the management function,
         of a GNBCUCPFunction managed by another management function.";
-      reference "3GPP TS 28.541";
       key id;
       uses top3gpp:Top_Grp;
       container attributes {
         uses ExternalGNBCUCPFunctionGrp;
       }
       uses mf3gpp:ManagedFunctionContainedClasses;
+      
+      uses extnrcellcu3gpp:ExternalNRCellCUSubtree;
     }
   } 
   
-  augment "/subnet3gpp:SubNetwork" {
-    if-feature subnet3gpp:ExternalsUnderSubNetwork ;
-    uses ExternalGNBCUCPFunctionWrapper;
+  feature ExternalGNBCUCPFunctionUnderNRNetwork {
+    description "The ExternalGNBCUCPFunction shall be contained under
+      NRNetwork";
   }
 
-  augment "/nrnet3gpp:NRNetwork" {
-    if-feature nrnet3gpp:ExternalsUnderNRNetwork;
+  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" 
+      + "nrnet3gpp:NRNetwork" {
+    if-feature ExternalGNBCUCPFunctionUnderNRNetwork;
     uses ExternalGNBCUCPFunctionWrapper;
   }		
-}
+
+  feature ExternalGNBCUCPFunctionUnderSubNetwork {
+    description "The ExternalGNBCUCPFunction shall be contained under
+      SubNetwork";
+  }
+ 
+  augment "/subnet3gpp:SubNetwork" {
+    if-feature ExternalGNBCUCPFunctionUnderSubNetwork ;
+    uses ExternalGNBCUCPFunctionWrapper;
+  }
+}
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
index 2445a1e995bf8ac8fe4ae2145ddfe9f36b00d91a..7948b9167aee69567692a8b8da7a1f83874cdb48 100755
--- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang
@@ -4,11 +4,14 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
   prefix "extgnbcuup3gpp";
 
   import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
   import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
 
   organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the ExternalGNBCUUPFunction
     Information Object Class (IOC), that is part of the NR Network
     Resource Model (NRM).
@@ -16,11 +19,10 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
-  revision 2019-06-17 {
-    description "Initial revision";
-  }
+  revision 2019-06-17 { reference "Initial revision"; }
 
   grouping ExternalGNBCUUPFunctionGrp {
     description "Represets the ExternalGNBCUUPFunction IOC.";
@@ -28,26 +30,27 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
     uses mf3gpp:ManagedFunctionGrp; 
             
     leaf gNBId {
-      description "Identifies a gNB within a PLMN.";
-      reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID
-        in 3GPP TS 38.413";
+      description "Identifies a gNB within a PLMN. 
+        The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells.
+
+        See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. 
+        See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
       mandatory true;
-      type int64 { range "0..4294967295"; }
+      type uint32 { range "0..4294967295"; }
     }
 
     leaf gNBIdLength {
       description "Indicates the number of bits for encoding the gNB ID.";
-      reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413";
+      reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
       mandatory true;
       type int32 { range "22..32"; }
     }
   }
 
-  grouping ExternalGNBCUUPFunctionWrapper {
+  grouping ExternalGNBCUUPFunctionSubtree {
     list ExternalGNBCUUPFunction {
       description "Represents the properties, known by the management function,
         of a GNBCUUPFunction managed by another management function.";
-      reference "3GPP TS 28.541";
       key id;
       uses top3gpp:Top_Grp;
       container attributes {
@@ -57,13 +60,24 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
     }
   } 
   
-  augment "/subnet3gpp:SubNetwork" {
-    if-feature subnet3gpp:ExternalsUnderSubNetwork ;
-    uses ExternalGNBCUUPFunctionWrapper;
+  feature ExternalGNBCUUPFunctionUnderNRNetwork {
+    description "The ExternalGNBCUUPFunction shall be contained under
+      NRNetwork";
+  }
+  
+  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" 
+      + "nrnet3gpp:NRNetwork" {
+    if-feature ExternalGNBCUUPFunctionUnderNRNetwork;
+    uses ExternalGNBCUUPFunctionSubtree;
   }
 
-  augment "/nrnet3gpp:NRNetwork" {
-    if-feature nrnet3gpp:ExternalsUnderNRNetwork;
-    uses ExternalGNBCUUPFunctionWrapper;
+  feature ExternalGNBCUUPFunctionUnderSubNetwork {
+    description "The ExternalGNBCUUPFunction shall be contained under
+      SubNetwork";
+  }
+ 
+  augment "/subnet3gpp:SubNetwork" {
+    if-feature ExternalGNBCUUPFunctionUnderSubNetwork ;
+    uses ExternalGNBCUUPFunctionSubtree;
   }	
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang
index 064b98db336c5bbe6ad0461a2471b7841836c192..e8dc9d6c699bbe7332aa565800d52d72b82f55e4 100755
--- a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang
@@ -3,26 +3,27 @@ module _3gpp-nr-nrm-externalgnbdufunction {
   namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalgnbdufunction";
   prefix "extgnbdu3gpp";
 
-  import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
   import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
 
   organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the ExternalGNBDUFunction
     Information Object Class (IOC) that is part of the NR Network Resource
     Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
-  revision 2019-06-17 {
-    description "Initial revision";
-  }
+  revision 2019-06-17 { reference "Initial revision"; }
 
   grouping ExternalGNBDUFunctionGrp {
     description "Represets the ExternalGNBDUFunction IOC.";
@@ -30,36 +31,28 @@ module _3gpp-nr-nrm-externalgnbdufunction {
     uses mf3gpp:ManagedFunctionGrp; 
             
     leaf gNBId {
-      description "Identifies a gNB within a PLMN.";
-      reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID
-        in 3GPP TS 38.413";
+      description "Identifies a gNB within a PLMN. 
+        The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells.
+
+        See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. 
+        See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
       mandatory true;
-      type int64 { range "0..4294967295"; }
+      type uint32 { range "0..4294967295"; }
       yext3gpp:inVariant;
     }
 
     leaf gNBIdLength {
       description "Indicates the number of bits for encoding the gNB ID.";
-      reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413";
+      reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
       mandatory true;
       type int32 { range "22..32"; }
     }
-
-    list pLMNId {
-      description "Specifies the PLMN identifier to be used as part of the
-        global RAN node identity.";
-      key "mcc mnc";
-      min-elements 1;
-      max-elements 1;
-      uses types3gpp:PLMNId;
-    }
   }
 
-  grouping ExternalGNBDUFunctionWrapper {
+  grouping ExternalGNBDUFunctionSubtree {
     list ExternalGNBDUFunction {
       description "Represents the properties, known by the management function,
         of a GNBDUFunction managed by another management function.";
-      reference "3GPP TS 28.541";
       key id;
       uses top3gpp:Top_Grp;
       container attributes {
@@ -69,13 +62,24 @@ module _3gpp-nr-nrm-externalgnbdufunction {
     }
   } 
   
-  augment "/subnet3gpp:SubNetwork" {
-    if-feature subnet3gpp:ExternalsUnderSubNetwork ;
-    uses ExternalGNBDUFunctionWrapper;
+  feature ExternalGNBDUFunctionUnderNRNetwork {
+    description "The ExternalGNBDUFunction shall be contained under
+      NRNetwork";
   }
 
-  augment "/nrnet3gpp:NRNetwork" {
-    if-feature nrnet3gpp:ExternalsUnderNRNetwork;
-    uses ExternalGNBDUFunctionWrapper;
+  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" 
+      + "nrnet3gpp:NRNetwork" {
+    if-feature ExternalGNBDUFunctionUnderNRNetwork;
+    uses ExternalGNBDUFunctionSubtree;
+  }
+
+  feature ExternalGNBDUFunctionUnderSubNetwork {
+    description "The ExternalGNBDUFunction shall be contained under
+      SubNetwork";
+  }
+ 
+  augment "/subnet3gpp:SubNetwork" {
+    if-feature ExternalGNBDUFunctionUnderSubNetwork ;
+    uses ExternalGNBDUFunctionSubtree;
   }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang
index b982aa12c22630a011a87fca72060d1b8f1b7a14..94ec2b7c74dd5f8dae82ae032b602e31eacfb83e 100755
--- a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang
+++ b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang
@@ -5,43 +5,57 @@ module _3gpp-nr-nrm-externalnrcellcu {
 
   import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-common-managed-function { prefix mf3gpp; }
-  import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
-  import _3gpp-common-subnetwork { prefix subnet3gpp; }
-  import _3gpp-nr-nrm-externalgnbcucpfunction { prefix extgnbcucp3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
 
   organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the ExternalNRCellCU Information
     Object Class (IOC), that is part of the NR Network Resource Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
-  
-  revision 2019-06-17 {
-    description "Initial revision";
-  }
+  revision 2019-06-17 { reference "Initial revision"; }
 
   grouping ExternalNRCellCUGrp {
     description "Represents the ExternalNRCellCU IOC."; 
-    reference "3GPP TS 28.541";
     uses mf3gpp:ManagedFunctionGrp;
         
     leaf cellLocalId {       	
-      description "Identifies an NR cell of a gNB. Together with corresponding
-        gNB ID it forms the NR Cell Identifier (NCI).";
-      reference "NCI in 3GPP TS 38.300";
+      description "It identifies a NR cell of a gNB. 
+
+      It, together with the gNB Identifier (using gNBId of the parent 
+      GNBCUCPFunction or GNBDUFunction or OperatorDU (for MOCN network 
+      sharing scenario) or ExternalCUCPFunction), identifies a NR cell within 
+      a PLMN. This is the NR Cell Identity(NCI). See subclause 8.2 of TS38.300.  
+
+      The NCI can be constructed by encoding the gNB Identifier using gNBId 
+      (of the parent GNBCUCPFunction or GNBDUFunction or OperatorDU 
+      (for MOCN network sharing scenario) or ExternalCUCPFunction) and 
+      cellLocalId where the gNB Identifier field is of length specified by
+      gNBIdLength (of the parent GNBCUCPFunction or GNBDUFunction or 
+      ExternalCUCPFunction). See 'Global gNB ID' in subclause 9.3.1.6 of 
+      TS 38.413.
+
+      The NR Cell Global identifier (NCGI) is constructed from the 
+      PLMN identity the cell belongs to and the NR Cell Identifier (NCI) of 
+      the cell.
+
+      See relation between NCI and NCGI subclause 8.2 of TS 38.300 ";
       mandatory true;
-      type int32 {range "0..16383"; }     	
+      type int32;     
     }
 
     leaf nRPCI {
-      description "The Physical Cell Identity (PCI) of the NR cell.";
-      reference "3GPP TS 36.211";
+      description "This holds the Physical Cell Identity (PCI) of the NR cell.
+
+      allowedValues: 
+      See 3GPP TS 36.211 subclause 6.11 for legal values of pci.";
       mandatory true;
-      type int32 { range "0..1007"; }
+      type int64;
     }
 
     list pLMNIdList {
@@ -62,11 +76,11 @@ module _3gpp-nr-nrm-externalnrcellcu {
     }
   }
 
-  grouping ExternalNRCellCUWrapper {
+  grouping ExternalNRCellCUSubtree {
     list ExternalNRCellCU {
-      description "Represents the properties of an NRCellCU controlled by
-        another Management Service Provider.";
-      reference "3GPP TS 28.541";
+      description "This IOC contains necessary attributes for inter-system 
+        and intra-system handover. It also contains a subset of the attributes 
+        of related IOCs controlled by Management Service Provider.";
       key id;
       uses top3gpp:Top_Grp;
       container attributes {
@@ -75,14 +89,4 @@ module _3gpp-nr-nrm-externalnrcellcu {
       uses mf3gpp:ManagedFunctionContainedClasses;
     }
   } 
-  
-  augment "/subnet3gpp:SubNetwork/extgnbcucp3gpp:ExternalGNBCUCPFunction" {
-    if-feature subnet3gpp:ExternalsUnderSubNetwork ;
-    uses ExternalNRCellCUWrapper;
-  }
-
-  augment "/nrnet3gpp:NRNetwork/extgnbcucp3gpp:ExternalGNBCUCPFunction" {
-    if-feature nrnet3gpp:ExternalsUnderNRNetwork;
-    uses ExternalNRCellCUWrapper;
-  }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang
index 1fd0469466dae9b8d194c519dc61134194860835..dcaba95b49fb25b777e10125119b57e98f4cf51f 100755
--- a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang
@@ -4,8 +4,7 @@ module _3gpp-nr-nrm-externalservinggwfunction {
   prefix "extservgw3gpp";
     
   import _3gpp-common-managed-function { prefix mf3gpp; }
-  import _3gpp-common-subnetwork { prefix subnet3gpp; }
-  import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; }
+  //import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
 
   organization "3GPP SA5";
@@ -16,6 +15,7 @@ module _3gpp-nr-nrm-externalservinggwfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
@@ -43,7 +43,7 @@ module _3gpp-nr-nrm-externalservinggwfunction {
     }
   } 
   
-  augment "/subnet3gpp:SubNetwork" {
+  /*augment "/subnet3gpp:SubNetwork" {
     if-feature subnet3gpp:ExternalsUnderSubNetwork ;
     uses ExternalServingGWFunctionWrapper;
   }
@@ -51,5 +51,5 @@ module _3gpp-nr-nrm-externalservinggwfunction {
   augment "/eutranet3gpp:EUtraNetwork" {
     if-feature eutranet3gpp:ExternalsUnderEUtraNetwork;
     uses ExternalServingGWFunctionWrapper;
-  }
+  }*/
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-externalupffunction.yang b/yang-models/_3gpp-nr-nrm-externalupffunction.yang
index 11e924daba44be7b0889f63b3befdccbc203581a..abe82b6c8b8a94ce6ea40a68d490758ec14da36d 100755
--- a/yang-models/_3gpp-nr-nrm-externalupffunction.yang
+++ b/yang-models/_3gpp-nr-nrm-externalupffunction.yang
@@ -4,17 +4,19 @@ module _3gpp-nr-nrm-externalupffunction {
   prefix "extupf3gpp";
     
   import _3gpp-common-managed-function { prefix mf3gpp; }
-  import _3gpp-common-subnetwork { prefix subnet3gpp; }
-  import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
+  /*import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }*/
   import _3gpp-common-top { prefix top3gpp; }
 
   organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the ExternalUPFFunction Information
     Object Class (IOC) that is part of the NR Network Resource Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 {
@@ -42,7 +44,7 @@ module _3gpp-nr-nrm-externalupffunction {
     }
   } 
   
-  augment "/subnet3gpp:SubNetwork" {
+  /*augment "/subnet3gpp:SubNetwork" {
     if-feature subnet3gpp:ExternalsUnderSubNetwork ;
     uses ExternalUPFFunctionWrapper;
   }
@@ -50,5 +52,5 @@ module _3gpp-nr-nrm-externalupffunction {
   augment "/nrnet3gpp:NRNetwork" {
     if-feature nrnet3gpp:ExternalsUnderNRNetwork;
     uses ExternalUPFFunctionWrapper;
-  }
+  }*/
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang
index a1589ef2b62eabd841a264bd4504c0fad8ccefd1..7dc30104915e292cc33a9fd470a9fae63145f0ad 100755
--- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang
+++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang
@@ -1,30 +1,29 @@
 module _3gpp-nr-nrm-nrfrequency {
   yang-version 1.1;
-  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork-nrfrequency";
+  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrfrequency";
   prefix "nrfreq3gpp";
 
-  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
   import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
 
   organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the NRFrequency Information Object
     Class (IOC) that is part of the NR Network Resource Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-04-25 { reference CR-1526 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
-  revision 2019-06-17 {
-    description "Initial revision";
-  }
+  revision 2019-06-17 { reference "Initial version"; }
 
   grouping NRFrequencyGrp {
     description "Represents the NRFrequency IOC.";
-    reference "3GPP TS 28.541";
-    uses mf3gpp:ManagedFunctionGrp;
 
     leaf absoluteFrequencySSB {
       description "The absolute frequency applicable for a downlink NR carrier
@@ -33,18 +32,20 @@ module _3gpp-nr-nrm-nrfrequency {
       type uint32 { range "0.. 3279165"; }
     }
 
-    leaf sSBSubCarrierSpacing {
-      description "Sub-carrier spacing of the SSB.";
+    leaf ssBSubCarrierSpacing {
+      description "Sub-carrier spacing of the SSB.
+        Note that the allowed values of SSB used for representing data, 
+        by e.g. a BWP, are: 15, 30, 60 and 120 in units of kHz.";
       mandatory true;
-      type uint8 { range "15 | 30 | 60 | 120"; }
+      type uint8 { range "15 | 30 | 60 | 120 | 240"; }
       units "kHz";
     }
 
-    leaf-list multiFrequencyBandListNR {
+    leaf multiFrequencyBandListNR {
       description "List of additional frequency bands the frequency belongs to.
         The list is automatically set by the gNB.";
+      mandatory true;
       config false;
-      min-elements 0;
       type uint16 { range "1..256"; }
     }
   }
@@ -52,23 +53,30 @@ module _3gpp-nr-nrm-nrfrequency {
   grouping NRFrequencyWrapper {
     list NRFrequency {
       description "Represents certain NR frequency properties.";
-      reference "3GPP TS 28.541";
       key id;
       uses top3gpp:Top_Grp;
       container attributes {
         uses NRFrequencyGrp;
       }
-      uses mf3gpp:ManagedFunctionContainedClasses;
     }
   } 
   
-  augment "/subnet3gpp:SubNetwork" {
-    if-feature subnet3gpp:ExternalsUnderSubNetwork ;
+  feature NRFrequencyUnderNRNetwork {
+  	description "NRFrequency shall be contained under NRNetwork";
+  }
+  
+  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" 
+      + "nrnet3gpp:NRNetwork" {
+    if-feature NRFrequencyUnderNRNetwork;
     uses NRFrequencyWrapper;
   }
 
-  augment "/nrnet3gpp:NRNetwork" {
-    if-feature nrnet3gpp:ExternalsUnderNRNetwork;
+  feature NRFrequencyUnderSubNetwork {
+  	description "NRFrequency shall be contained under SubNetwork";
+  }
+  
+  augment "/subnet3gpp:SubNetwork" {
+    if-feature NRFrequencyUnderSubNetwork;
     uses NRFrequencyWrapper;
   }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-nrnetwork.yang b/yang-models/_3gpp-nr-nrm-nrnetwork.yang
index 9e622884df55a0e936c5935124d5140dbb28bb0c..044c2d0db83e2bedc3a58e62ecef87d855e71d50 100755
--- a/yang-models/_3gpp-nr-nrm-nrnetwork.yang
+++ b/yang-models/_3gpp-nr-nrm-nrnetwork.yang
@@ -3,40 +3,37 @@ module _3gpp-nr-nrm-nrnetwork {
   namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork";
   prefix "nrnet3gpp";
 
-  import _3gpp-common-subnetwork { prefix subnet3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
 
   organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the NRNetwork Information Object
     Class (IOC) that is part of the NR Network Resource Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common r17, r18 
   revision 2023-09-18 { reference CR-1043 ; } 
-  revision 2019-06-17 {
-    description "Initial revision";
-  }
-
-  feature ExternalsUnderNRNetwork {
-    description "Classes representing external entities like NRFrequency, 
-      ExternalGNBCUCPFunction, ExternalGNBDUFunction 
-      are contained under a NRNetwork list/class.";
-  }
+  revision 2019-06-17 { reference "Initial revision"; }
 
   grouping NRNetworkGrp {
-    description "Represents the NRNetwork IOC.";
-    reference "3GPP TS 28.541";
-    uses subnet3gpp:SubNetworkGrp;
+    description "Represents the NRNetwork IOC.
+      Contains no additiona attributes.";
   }
 
-  list NRNetwork {
-    description "A subnetwork containing gNB external NR entities.";
-      reference "3GPP TS 28.541";
-    key id;
-    uses top3gpp:Top_Grp;
-    container attributes {
-      uses NRNetworkGrp;
+  augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction {
+    list NRNetwork {
+      description "Represents a set of NR frequencies and external NR entities 
+        (e.g. ExternalGNBCUCPFunction). This is used to differentiate these
+        entities and frequencies from those in EUTRAN.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses NRNetworkGrp;
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang
index 42afcf2489a71eb8583c5e31cc9d296579c25d65..b4d490fbbfc32cd8b8b1e0834aeb27d2bac84672 100755
--- a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang
+++ b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang
@@ -14,10 +14,11 @@ module _3gpp-nr-nrm-nroperatorcelldu {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the OperatorDU Information Object
     Class (IOC) that is part of the NR Network Resource Model (NRM).
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-05-06 { reference "CR-1526 CR-1527" ; }  // common for R18, R19
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-10-01 { reference "Initial revision"; }
@@ -79,7 +80,6 @@ module _3gpp-nr-nrm-nroperatorcelldu {
       container attributes {
         uses NROperatorCellDUGrp;
       }
-    uses gnbdu3gpp:GNBDUFunctionGrp;
     }
   }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang
index 98a702b779dc1e9c00928f3dbd927c7d365f2865..f50f7873aebb50b82796e1e65ba17994da3c8beb 100755
--- a/yang-models/_3gpp-nr-nrm-operatordu.yang
+++ b/yang-models/_3gpp-nr-nrm-operatordu.yang
@@ -7,15 +7,17 @@ module _3gpp-nr-nrm-operatordu {
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-nr-nrm-gnbdufunction {prefix gnbdu3gpp; }
   import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-nr-nrm-ep { prefix ep3gpp; }
   
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the OperatorDU Information Object
     Class (IOC) that is part of the NR Network Resource Model (NRM).
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-05-06 { reference "CR-1526 CR-1527" ; }  // common for R18, R19
   revision 2024-02-24 { reference CR-1218; } 
   revision 2023-11-14 { reference "CR1136"; }
   revision 2023-09-30 { reference "CR1048"; }
@@ -76,7 +78,14 @@ module _3gpp-nr-nrm-operatordu {
       container attributes {
         uses OperatorDUGrp;
       }
-      uses gnbdu3gpp:GNBDUFunctionGrp;
+      
+      uses ep3gpp:EP_F1CSubtree {
+        refine EP_F1C {
+          max-elements 1;
+        }
+      }
+        
+      uses ep3gpp:EP_F1USubtree;
     }
   }
 }
\ No newline at end of file