missing changes from cdr_type