Parsers improvements