Updates regarding separate schema in CV project.