Improve update operator