Refactored Entity Framework