Major ILPClusteringMixin update