Rename and refactor base_extractor