Adding functionality to find clusters