added GroupBy to Criteria