Fix Storage::factory()