Update for new comparison tool semantics