Added more code for the server