Updates in templates and schemas

Updates in templates and schemas relationg to headings