Improve performance of repeating features and scenarios with a sentence modifier