Improved cluster support and sentinel failover