The hash table needs the type too in the hash
Merge branch 'hashtables'