Add grouping
Add attributes and text