Edmx fix attempt 3