Improve how sections are created