Rebuilt how CMS is accessed