Adding Charging support