CCS improvements & traces