Adding ModelFactory