core improvements for clustering module