update CWTrie to CWTrie2