Refactor Hydra, ...