Continue hashtable refactoring