Moving HA definitions to a bundle in def.cf.