POC: Moved the factory from QuerySet to Manager