Adding support for hydra classes