Adding code for charging/consumption rate and time taken for both