Updated common and cdb