better cb-client dependency