Refactoring - repository only.