Improved update mechanism.