Add flag to make using probabilities optional