Fix integration with WS