Expanded CLI, added ListTrie dependency.