YAGNI

Also change the contract of the IRepositoryManager interface