Parsers refactored