DueOn bug - removed all references to ChargeStructure and charge_structure