added CDB support