Updated with WS client support