Refactor section model