- Re-impletemt Detector class (#16)