Water Heater with pump