Detection Improvements