Adjusted for new cvs configuration