Improved the client-server protocol