plugin upgrades
Fix with new extractor API