Repository refactored.