EFRepositories Refactoring