Improve User & Payments