Move logic into BaseCVFactory subclasses