Changes after make update_cdb