DONE with the refactoring Repository layer