Added new FeatureGenerator classes for combining types of features