[*] Added websockets support to the new structure