Added Voltage support & Worked on energy code