Refined payment flow