PTSYS-92: Using nested groups rather than direct