Added cluster support