diff --git a/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang
index 8aa498d81f783f515353dec752e7c008d32ecf18..7235d704b2064f227e4f168912d495b7f54e565e 100755
--- a/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-cesmanagementfunction.yang
@@ -25,9 +25,73 @@ module _3gpp-nr-nrm-cesmanagementfunction {
     uses top3gpp:Top_Grp;
 
     leaf cesSwitch {
-        description "This attribute determines whether the Cross Domain-Centralized SON energy saving function is enabled or disabled.";
+        description "This attribute determines whether the Centralized SON energy saving function is enabled or disabled.";
          type boolean;
     }
+  list intraRatEsActivationOriginalCellLoadParameters {
+    key loadThreshold;
+      description "This attributes is relevant, if the cell acts as an original cell.This attribute indicates the traffic load threshold and the time duration, which are used by distributed ES algorithms to allow a cell to enter the energySaving state.";
+    leaf loadThreshold {type int32;}
+    container attributes {
+      uses IntraRatEsActivationOriginalCellLoadParametersGrp;
+     }
+    }
+
+
+  list intraRatEsActivationCandidateCellsLoadParameters {
+    key loadThreshold;
+      description "This attribute indicates the traffic load threshold and the time duration, which are used by distributed ES algorithms level to allow a n ‘original’ cell to enter the energySaving state.";
+    leaf loadThreshold {type int32;}
+    container attributes {
+        uses IntraRatEsActivationCandidateCellsLoadParametersGrp;
+     }
+    }
+
+  list intraRatEsDeactivationCandidateCellsLoadParameters {
+    key loadThreshold;
+      description "This attributes is relevant, if the cell acts as a candidate cell.This attribute indicates the traffic load threshold  and the time duration which is used by distributed ES algorithms to allow a cell to leave the energySaving state.";
+    leaf loadThreshold {type int32;}
+    container attributes {
+        uses IntraRatEsDeactivationCandidateCellsLoadParametersGrp;
+     }
+    }
+
+  list esNotAllowedTimePeriod {
+    key startTimeandendTime;
+      description "This attribute indicates a list of time periods during which inter-RAT energy saving is not allowed.";
+    leaf startTimeandendTime {type string;}
+    container attributes {
+        uses EsNotAllowedTimePeriodGrp;
+     }
+    }
+
+  list interRatEsActivationOriginalCellParameters {
+    key loadThreshold;
+      description "This attribute indicates the traffic load threshold and the time duration, which are used by distributed inter-RAT ES algorithms to allow an original cell to enter the energySaving state.";
+    leaf loadThreshold {type int32;}
+    container attributes {
+        uses InterRatEsActivationOriginalCellParametersGrp;
+     }
+    }
+
+  list interRatEsActivationCandidateCellParameters {
+    key loadThreshold;
+      description "This attribute indicates the traffic load threshold and the time duration, which are used by distributed inter-RAT ES algorithms to allow an original cell to enter the energySaving state.";
+    leaf loadThreshold {type int32;}
+    container attributes {
+        uses InterRatEsActivationCandidateCellParametersGrp;
+     }
+    }
+
+  list interRatEsDeactivationCandidateCellParameters {
+    key loadThreshold;
+      description "This attribute indicates the traffic load threshold and the time duration which is used by distributed inter-RAT ES algorithms to allow an original cell to leave the energySaving state.";
+    leaf loadThreshold {type int32;}
+    container attributes {
+        uses InterRatEsDeactivationCandidateCellParametersGrp;
+     }
+    }
+
 
     leaf energySavingState {
         description "Specifies the status regarding the energy saving in the cell. If the value of energySavingControl is toBeEnergySaving, then it shall be tried to achieve the value isEnergySaving for the energySavingState. If the value of energySavingControl is toBeNotEnergySaving, then it shall be tried to achieve the value isNotEnergySaving for the energySavingState. ";
@@ -48,6 +112,134 @@ module _3gpp-nr-nrm-cesmanagementfunction {
 
     
   }
+  grouping IntraRatEsActivationOriginalCellLoadParametersGrp {
+    description "Represents the the traffic load threshold and the time duration.";
+
+    leaf loadThreshold {
+        description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state.";
+        type int32 { range "0..10000"; }
+		units "1";
+    }
+
+
+    leaf timeDuration {
+        description " The time duration indicates how long the load needs to have been below the threshold.";
+        type int32 { range "0..900"; }
+		units "1";
+    }
+  }
+
+  grouping IntraRatEsActivationCandidateCellsLoadParametersGrp {
+    description "Represents the the traffic load threshold and the time duration.";
+
+    leaf loadThreshold {
+        description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state.";
+        type int32 { range "0..10000"; }
+		units "1";
+    }
+
+
+    leaf timeDuration {
+        description " The time duration indicates how long the load needs to have been below the threshold.";
+        type int32 { range "0..900"; }
+		units "1";
+    }
+  }
+
+  grouping IntraRatEsDeactivationCandidateCellsLoadParametersGrp {
+    description "Represents the the traffic load threshold and the time duration.";
+
+    leaf loadThreshold {
+        description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state.";
+        type int32 { range "0..10000"; }
+		units "1";
+    }
+
+
+    leaf timeDuration {
+        description " The time duration indicates how long the load needs to have been below the threshold.";
+        type int32 { range "0..900"; }
+		units "1";
+    }
+  }
+
+  grouping EsNotAllowedTimePeriodGrp {
+    description "Represents the the traffic load threshold and the time duration.";
+
+    leaf startTimeandendTime {
+        description "This field indicate valid UTC time.";
+        type string;
+    }
+
+
+    leaf periodOfDay {
+        description "This field indicate the period of day.";
+        type string;
+    }
+
+    leaf daysOfWeekList {
+        description "This field indicate the list of weekday.";
+        type string;
+    }
+
+    leaf listoftimeperiods {
+        description "This field indicate the list of time periods.";
+        type string;
+    }
+
+  }
+
+  grouping InterRatEsActivationOriginalCellParametersGrp {
+    description "Represents the the traffic load threshold and the time duration.";
+
+    leaf loadThreshold {
+        description "The time duration indicates how long the traffic load (both for UL and DL) needs to have been below the threshold.";
+        type int32 { range "0..10000"; }
+		units "1";
+    }
+
+
+    leaf timeDuration {
+        description " The time duration indicates how long the load needs to have been below the threshold.";
+        type int32 { range "0..900"; }
+		units "1";
+    }
+  }
+
+  grouping InterRatEsActivationCandidateCellParametersGrp {
+    description "Represents the the traffic load threshold and the time duration.";
+
+    leaf loadThreshold {
+        description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state.";
+        type int32 { range "0..10000"; }
+		units "1";
+    }
+
+
+    leaf timeDuration {
+        description "The time duration indicates how long the traffic load (both for UL and DL) in the candidate cell needs to have been below the threshold before any original cells which will be provided backup coverage by the candidate cell enters energySaving state.";
+        type int32 { range "0..900"; }
+		units "1";
+    }
+  }
+
+  grouping InterRatEsDeactivationCandidateCellParametersGrp {
+    description "Represents the the traffic load threshold and the time duration.";
+
+    leaf loadThreshold {
+        description "This attribute is used by distributed ES algorithms to allow a cell to enter the energySaving state.";
+        type int32 { range "0..10000"; }
+		units "1";
+    }
+
+
+    leaf timeDuration {
+        description "The time duration indicates how long the traffic load (either for UL or DL) in the candidate cell needs to have been above the threshold to wake up one or more original cells which have been provided backup coverage by the candidate cell.";
+        type int32 { range "0..900"; }
+		units "1";
+    }
+  }
+
 
   augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU" {
     if-feature nrcellcu3gpp:CESManagementFunction;
diff --git a/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang b/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang
index 1437acece70c3f883c48a21a66547f036f816e51..918c0581fdaba52fe6de4a359dd5d6b271ff0716 100755
--- a/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-cpciconfigurationfunction.yang
@@ -35,7 +35,7 @@ module _3gpp-nr-nrm-cpciconfigurationfunction {
 
 
     leaf cPciConfigurationControl {
-        description "This attribute determines whether the Cross Domain-Centralized SON PCI configuration function is enabled or disabled.";
+        description "This attribute determines whether the Centralized SON PCI configuration function is enabled or disabled.";
         type boolean;
     }
 
diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
index b4b86d2b00dd57e362b5690967ba67c6e9873028..a69c94e792122b2cdcb6821b96e8826233f603a8 100755
--- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang
@@ -26,7 +26,7 @@ module _3gpp-nr-nrm-desmanagementfunction {
     uses top3gpp:Top_Grp;
 
     leaf desSwitch {
-        description "This attribute determines whether the Distributed SON or Domain-Centralized SON energy saving function is enabled or disabled.";
+        description "This attribute determines whether the Distributed SON energy saving function is enabled or disabled.";
          type boolean;
     }
 
diff --git a/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang b/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang
index dce102ff2cc6c3176c5a090fb85e63b8c06c1c3e..a150af4b7540e0bc174d422a7cad6eb821b1fa15 100755
--- a/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-dpciconfigurationfunction.yang
@@ -28,7 +28,7 @@ module _3gpp-nr-nrm-dpciconfigurationfunction {
 
     list nRPciList {
       key NRPci;
-      description "This holds a list of physical cell identities that can be assigned to the NR cells. This attribute shall be supported if D-SON PCI configuration or domain Centralized SON PCI configuration function is supported.";
+      description "This holds a list of physical cell identities that can be assigned to the NR cells. This attribute shall be supported if D-SON PCI configuration function is supported.";
 	  leaf NRPci {type int32;}
       container attributes {
          uses NRPciListGrp;
@@ -37,7 +37,7 @@ module _3gpp-nr-nrm-dpciconfigurationfunction {
 
 
     leaf dPciConfigurationControl {
-        description " This attribute determines whether the Distributed SON or Domain-Centralized SON PCI configuration Function is enabled or disabled.";
+        description " This attribute determines whether the Distributed SON PCI configuration Function is enabled or disabled.";
         type boolean;
     }
 
diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index 8e8d2adf3da9e3a2b76add13965297c58dee7795..04122e97f252431b21f1873cf1910dab35a7f974 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -28,7 +28,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
   }
 
   feature DESManagementFunction {
-    description "Classs representing Distributed SON or Domain-Centralized SON Energy Saving feature";
+    description "Classs representing Distributed SON Energy Saving feature";
   }
 
   feature DANRManagementFunction {
diff --git a/yang-models/_3gpp-nr-nrm-nrcellcu.yang b/yang-models/_3gpp-nr-nrm-nrcellcu.yang
index 3aa5db4d5c6957f4a1ea4b5090caa23fc9042cba..a0a3e9889e85044c145efcceda3c18cc4b5cfca0 100755
--- a/yang-models/_3gpp-nr-nrm-nrcellcu.yang
+++ b/yang-models/_3gpp-nr-nrm-nrcellcu.yang
@@ -26,12 +26,12 @@ module _3gpp-nr-nrm-nrcellcu {
   revision 2019-06-17 { reference "Initial revision"; }
 
   feature DPCIConfigurationFunction {
-    description "Class representing Distributed SON or Domain-Centralized SON
+    description "Class representing Distributed SON 
  function of PCI configuration feature";
   }
 
   feature DESManagementFunction {
-    description "Class representing Distributed SON or Domain-Centralized SON 
+    description "Class representing Distributed SON  
       Energy Saving feature";
   }
 
@@ -40,7 +40,7 @@ module _3gpp-nr-nrm-nrcellcu {
   }
 
   feature CESManagementFunction {
-    description "Class representing Cross Domain-Centralized SON Energy Saving 
+    description "Class representing Centralized SON Energy Saving 
       feature";
   }
 
diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang
index f81da5001c5b4e6c9f8337adb7a0a4b2e9b8f1af..7869934b1c1b49112a5c0dd9fdb4e9c1a5c985d9 100755
--- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang
+++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang
@@ -33,7 +33,7 @@ module _3gpp-nr-nrm-nrcelldu {
   }
   
   feature CPCIConfigurationFunction {
-    description "Class representing Cross Domain-Centralized SON function of 
+    description "Class representing Centralized SON function of 
       PCI configuration feature";
   }