Some minor changes for change tracking and check for persistance change type.