PIM-1890: Add groups