Some more work related to the EnergyValueRegistry API, should definitely work now