Added Extractor, Enricher draft