Add preliminary support for tagging with probabilities