Improved update mechanism