Some adjustments to the server class