Improve Trie draft