Added CDIFacet and tests