Fixup handling
Add PaymentMethod