Adding RepairOrReplace support