Major changes in section handling