Added support for Tree fields on nonterminal types