Daily repository refactoring