Updated Entity Framework