Move to the chain discriminator and stop using similar sets