Restructure of parser and parsed result