Improved discriminator support