Changes for Server Failover