Refreshed APIs, working on Energy Storage mechanics