Switched parsers to classes