Lots of changes to EF.