Added scope to CMS and core CMS class
Core improvements and added scopes