Sections refactoring