Consolidating CMS Plugin into core