Some changes to server object(seperated to other project)