More additions for CCM support