Adding support for cb 1.6_R1