[Motherless] Add new extractor
Merge pull request #3167 from Schnouki/motherless

* mother/motherless:
  [Motherless] Add new extractor
[Motherless] simplify