Updated Trie stuff