Corrected EnergyStorageHandler not using some methods preventing proper overrides