Added extra variables for energy scale