Edited DefaultFeatureGeneration to avoid infinite loops