Rework for 'Update' items