Upgraded to Entity Framework 6