Track latest CMS refactor updates