UserCode migration from CVS