Modified class hierarchy of CDS's