Added support for changing payment method