Made changes to PaymentRequest implementation