Update for new Result types and WS hierarchy