Add feature
Add extractor to fix originating mentions