Add sections and nested sections support