Add support for clustering
8 files changed