Server Class Changes