Done with Detector implementation