Improve payment system