Add improved trie implementation
Add regenerated data.json based on new trie implementation