fixed cdb imports