DataStore was refactored