Add more structure to parser.