Refactored to allow for ParserNames