Refactor Hydra