Updated to CBL beta 2 API