Yes I was hoping for both, but it seems to be that the best way is to separate all payment gateways. Just in the sake to keep flexible.