Support for CVS