DataExtractor was refactored