made cms more generic