Payment Methods Improvements