More robust and with cluster support