Improve subsection support