Making hydra module safer.