Add anchors and groupings