Improve Paypal status management