Feature/extractor refactor 188