Add support for multiple sections