IDM-65 Add computed groups