Refactor for the DataStore changes.