Added CV support