Adds support for empty sections