Modifications for cms_manage