energy evaluators now return dictionaries and include units