Add early ref to hierarchical grouping