HA Mode support finished