Fixed gateway_type, child records were overwritten