Lots of updates to the CMS backend