Updated CMS controller
Initial CMS commit