Why this change? `cid` seems to be the only property used