Support for CMS 7.1