Charge code functionality updated