Most of the changes to payment integration