you could use the existing org id as your discriminator - though it must be named tenantId - but you can work around that