Add support to the hashing infrastructure for automatically hashing both