Add high availability enhancement