New Extractor Refactor into deep-commons