WIP: Adds Support for Named HA