Adding in cluster support