Added kWh/h support