Changes to server class