More refactoring SectionHandler -> RowHandler