Modify to work with Hydra 1.0