Update imports for new CB