Consistency, bro!
Added preliminar support for websockets