Moving to the new factory approach