Added the changes for the server