Updating is optimized