Upgraded server-client API.