Make data updates more robust