Add DataStorageFactory