Refactoring repository
Refactoring repository