Work on the Server and object system