Add support for subsections