Upgraded Entity Framework