Updated the server class