cvs front/end support, refactoring