Separated setup code/added energy performance data import