Improvements to the client interface