Further refactoring to lose the dependency on a concrete DbContext implementation