do some changes in ParserImpl and related classes