Added some clustering-related classes.