Two kinds of feature extractors added