Adding additional hvac state tracking