Starting from first release, this version will take into account feedback from Energy ADE working group members