In order to support hydro, changed several minor stuff