Improve the client interface.