More work moving over to hat-trie