more CMS integration