updates to latest Cluster WS changes