Added hashing support