Fixed support for CBL dbs