Updated for hyrax-1.10