Refactor the server object and manager