Simplified the discriminator types