Re-factoring factories.