[*] CMS update