added zoneID to water heating equipment