Made the server implementation smarter.