Edit to FeatureCalculator