Repeatability and ID update refactor for DefectTracker