Upgraded EDMX