Improving energy demand analysis