CMS implement & index changes