Adopt new Hydra convention