Added proper hashing