Added Charge creation and Task creation