Working on enforcePrimaryDomain