Cdr model fixes