Updated socket server