WIP: adapting payment services