Updated WS spec following remarks