Update for the new factory