Refactor to make Cluster examples work
Refactor to make Cluster examples work