CMS improvements