fixed CDS to have both CDS and DCS services for legacy