ENH: add clustering option