Some changes in trie.hpp