Handle hashes better