Added support for solar PV