cvs support, refactoring