Updated ParserSelector