Added importing solar and wind capability