Updated sampler to support And Or Equal factors