CMS::Collection changes for dealing with string-based model cids