Moved to extractor