Added discriminator type and discriminator values