Added cv_pmf and up_pmf tools