Mutually exclusive options improvements