[Motherless] Add new extractor