Cluster support added