Updates to new CMS style