Improve payment migration
USe status def everywhere