Added EnergySystem and ValueOutOfRangeException