Added more to the new parser.