Refactoring headings support