Adding clustering