Added failover solution