Parsers upgrade