Improved performance on iteration update