Fin - 81 - Changes related to Create Charge