FeatureExtractor class. Minor updates