cv-service refactor