Added attention to current simplistic failover handling