Updated factories.