Adjust APIs to client.