Rewrite classifier and add SimpleExtractor