parsers imrovements