Updates for CMS core changes