Added grouping by card types