Use name based Extractors, close #2341