Added ParserFactory part2