Project sync with CMS modifications