Datastorage and Token changes