Refined the hashing capabilities