Updated to support EF6-RC1 reorganization