Hashing improvements