Adding support for failover servers