Compatibility with lastest CMS