Add WSS support