Updated for EF 6 RC 1