Turned cvf into new style class.