This can be removed (storageFactories too)