Payment gateways processing can be simplified now. See #319