cda and ccd missed refactored changes
FIX: ccd dsl recursive mk_class