Adapt to changed extractor interface