Lots of changes
ServerUtil class