import_charge_spec refactored