Replace dictionaries used as sets in StorageWraper with sets