Changed parser to include nodes