New buildscript and generic-ize energy entries