Sections configuration process started plus some refactoring