Many additions for CMS and related