Improve section implementation