Fixed Charging State Time
Added new OptionCode values