Improved extractor's capabilities