Updated to EF6