Fix extractor lookup
Rework internal plugin API