Changes for integrating the socket-io