Added string grouping