More work on hash table implementation