added more structure to the Cluster WS module