Added headings support