Support 610 demo in hydro