PIM-1837: Add changes for group type and attributes