more cbc support updates