Updated clusterer lib