Better payment_types support for commissions