Updates for cbang changes