SectionLoader refactoring