Update DataStore and impl of it