Changed Scope to remove Location , CMS & Payment