Refactored Cv_*