Added support for WSS