Updated the new Server classes