Drop compatibility module.
Change arguments to scope inside api.
Change activity and move to client.