Stop using similar sets and introduce chain discriminators