Added auto clustering.