added --cluster support