Added ContentCondition to discriminator