[TASK] Improving CMS 7.0 compatibility