Added changes to enhance the Server