Added some useful methods to EnergyStorageHandler