Adding orphan grouping