Added Clustering Setup