* Switch from options to optimised trie