[2.1.1.5.1] Add more headings for organization