Refactored store to return a DictionaryId