Add support for hydro