Updated parent-child group lists
Updated loops for performance