Updated for Hydra v3.1.2