Added graceful failover