Updated Clusterer to make it more generic