Updated parser to use new program tree