Changes needed for working registration in CMS