Make GenericHydra collectible; closes #5