Incorporate Hydra breaking changes