Improve payment moduel