Add basic support for clustering