[DCCP] CCID: Improve CCID infrastructure