Improve change tracking to reduce useless updates