Add Device Repair helper methods