Adding changes for the server