cvs helper new API and refactoring