Minor work on server implementation