Initial upgrade to EF6