Clustering and IoC update