Add support for extractor