Charging system and upgrades