Better tracking of widget changes