[Extractor] Improvement to be more flexible with all kind of extractor