Necessary changes for the server