Added more logging in HA