- Repository Refactor continued