CDR model fixes