Added clustering feature