Add HA Support and Bug Fixes