update for EF 6