Further implementation of cdv support