Add cluster support