Extractor plugin re-work: work in progress