diff --git a/packages/Webkul/CMS/src/Repositories/CmsRepository.php b/packages/Webkul/CMS/src/Repositories/CmsRepository.php
index f7856bb9f..61983fb62 100644
--- a/packages/Webkul/CMS/src/Repositories/CmsRepository.php
+++ b/packages/Webkul/CMS/src/Repositories/CmsRepository.php
@@ -5,7 +5,7 @@ namespace Webkul\CMS\Repositories;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Webkul\Core\Eloquent\Repository;
-use Webkul\CMS\Models\CmsPageTranslation;
+use Webkul\CMS\Models\CmsPageTranslationProxy;
 
 class CmsRepository extends Repository
 {
@@ -76,7 +76,7 @@ class CmsRepository extends Repository
      */
     public function isUrlKeyUnique($id, $urlKey)
     {
-        $exists = CmsPageTranslation::where('cms_page_id', '<>', $id)
+        $exists = CmsPageTranslationProxy::modelClass()::where('cms_page_id', '<>', $id)
             ->where('url_key', $urlKey)
             ->limit(1)
             ->select(\DB::raw(1))
diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
index a2df9fdb1..a48385795 100755
--- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
+++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
@@ -4,7 +4,6 @@ namespace Webkul\Category\Http\Controllers;
 
 use Illuminate\Support\Facades\Event;
 use Webkul\Category\Repositories\CategoryRepository;
-use Webkul\Category\Models\CategoryTranslation;
 use Webkul\Attribute\Repositories\AttributeRepository;
 
 class CategoryController extends Controller
@@ -87,18 +86,6 @@ class CategoryController extends Controller
             'description' => 'required_if:display_mode,==,description_only,products_and_description',
         ]);
 
-        if (strtolower(request()->input('name')) == 'root') {
-            $categoryTransalation = new CategoryTranslation();
-
-            $result = $categoryTransalation->where('name', request()->input('name'))->get();
-
-            if(count($result) > 0) {
-                session()->flash('error', trans('admin::app.response.create-root-failure'));
-
-                return redirect()->back();
-            }
-        }
-
         $category = $this->categoryRepository->create(request()->all());
 
         session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Category']));
diff --git a/packages/Webkul/Category/src/Repositories/CategoryRepository.php b/packages/Webkul/Category/src/Repositories/CategoryRepository.php
index 3785b1c41..b4c452ebd 100755
--- a/packages/Webkul/Category/src/Repositories/CategoryRepository.php
+++ b/packages/Webkul/Category/src/Repositories/CategoryRepository.php
@@ -7,7 +7,7 @@ use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Event;
 use Webkul\Core\Eloquent\Repository;
 use Webkul\Category\Models\Category;
-use Webkul\Category\Models\CategoryTranslation;
+use Webkul\Category\Models\CategoryTranslationProxy;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Facades\DB;
 
@@ -120,8 +120,8 @@ class CategoryRepository extends Repository
      * @return bool
      */
     public function isSlugUnique($id, $slug)
-    {
-        $exists = CategoryTranslation::where('category_id', '<>', $id)
+    {   
+        $exists = CategoryTranslationProxy::modelClass()::where('category_id', '<>', $id)
             ->where('slug', $slug)
             ->limit(1)
             ->select(DB::raw(1))
diff --git a/packages/Webkul/Product/src/Repositories/ProductAttributeValueRepository.php b/packages/Webkul/Product/src/Repositories/ProductAttributeValueRepository.php
index 77e3dce1e..f26344d63 100755
--- a/packages/Webkul/Product/src/Repositories/ProductAttributeValueRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductAttributeValueRepository.php
@@ -5,7 +5,7 @@ namespace Webkul\Product\Repositories;
 use Illuminate\Container\Container as App;
 use Webkul\Attribute\Repositories\AttributeRepository;
 use Webkul\Core\Eloquent\Repository;
-use Webkul\Product\Models\ProductAttributeValue;
+use Webkul\Product\Models\ProductAttributeValueProxy;
 
 class ProductAttributeValueRepository extends Repository
 {
@@ -59,7 +59,7 @@ class ProductAttributeValueRepository extends Repository
             return;
         }
 
-        $data[ProductAttributeValue::$attributeTypeFields[$attribute->type]] = $data['value'];
+        $data[ProductAttributeValueProxy::modelClass()::$attributeTypeFields[$attribute->type]] = $data['value'];
 
         return $this->model->create($data);
     }
diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php
index 22ea78842..75c19a6e7 100755
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@@ -9,7 +9,7 @@ use Illuminate\Support\Facades\Event;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Webkul\Attribute\Repositories\AttributeRepository;
 use Webkul\Core\Eloquent\Repository;
-use Webkul\Product\Models\ProductAttributeValue;
+use Webkul\Product\Models\ProductAttributeValueProxy;
 
 class ProductRepository extends Repository
 {
@@ -175,7 +175,7 @@ class ProductRepository extends Repository
                     foreach ($attributeFilters as $attribute) {
                         $filterQuery->orWhere(function ($attributeQuery) use ($attribute) {
 
-                            $column = 'product_attribute_values.' . ProductAttributeValue::$attributeTypeFields[$attribute->type];
+                            $column = 'product_attribute_values.' . ProductAttributeValueProxy::modelClass()::$attributeTypeFields[$attribute->type];
 
                             $filterInputValues = explode(',', request()->get($attribute->code));