Factory now in core