updates to the new WS conventions