Another repository refactoring