Add HA support.
Remove singleton.