Adding support for hashes