Adding support for ClusterView.