Reverted the cluster criterias to be a list instead of a set to preserve order.