add support for clustering