Switched to new trie