Clustering performance improvements.