Added entity detectors