Use correct hydra type and subtype