Renamed Mode trait to CBM