Update for cb changes