Implemented cluster support