Refactor more in repo model