Better support for clustering
5 files changed