CMS module has been improved