Added Cluster support