optimizations for Detectors System
update docblocks