first pass at removing EFContext same namespace restriction