Adding OS HA support