Refactor to make Cluster examples work