Upgraded to EF 6.0