Changes due to single socket server change