Add hashing functions
Tweak find functions