More shuffling of the EF data model