ServerNetwork improvements
ServerNetwork changes