Payment Gateway improvements