Reworked the structure of the section classes