Added 2 CDS support