Improvement for high availability