Added support for clusters.