Extractor refactoring