More conversion to CBV