nshmp-ws-utils

Update to use nshmp-ws-utils