Repository Refactors