Updated for CMF doc refactoring