Adjusted detector/extractor API