Sections refactor