Add helpers for HA