add clustering option to savepoints