Upgraded to Entity Framework 5