A bit more work on payment service