Refactored extractor to work with the new version.