A tank-type water heater includes a storage tank and a heating circuit outside of the tank. The heating circuit includes at least one heat engine and at least one pump for circulating water from the bottom of the tank through the heat engine and back to the top of the tank. A stratifier introduces the heated water from the heating circuit into the top of the tank in a diffuse manner to promote stratification of hot water in the tank.