Added ParserFactory and few other parsers