Updated energy manager