added some new features around the web sockets