Import additional CMS headers and update docs