Update for custom CMS