Now groups by type