Refactored Hydra expression to use new convention