Moved completion methods into PaymentService