Updates to the WSS support module