Upgraded to EF 6