Updated class factory and models parser.