Changes to FeatureExtractors