Add failover support