Improve payment module