Upgraded entity framework