Updated parse tree generation