Upgrade to EF6 #2