Added code for udaemon and websockets