DB Code First refactoring