HCOLL-103 added the first version of clustering