Tweak data update handling