diff --git a/config/repository.php b/config/repository.php
index 3123c2789..f8498b8db 100755
--- a/config/repository.php
+++ b/config/repository.php
@@ -169,7 +169,8 @@ return [
         */
         'acceptedConditions' => [
             '=',
-            'like'
+            'like',
+            'in'
         ],
         /*
         |--------------------------------------------------------------------------
diff --git a/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php b/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php
index 930a6a8df..020d74d3f 100755
--- a/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php
@@ -192,8 +192,6 @@
 
             </div>
 
-            @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
             <div class="sale-stock">
                 <div class="card">
                     <div class="card-title">
@@ -208,7 +206,7 @@
                                 <li>
                                     <a href="{{ route('admin.catalog.products.edit', $item->product_id) }}">
                                         <div class="product image">
-                                            <?php $productBaseImage = $productImageHelper->getProductBaseImage($item->product); ?>
+                                            <?php $productBaseImage = ProductImage::getProductBaseImage($item->product); ?>
 
                                             <img class="item-image" src="{{ $productBaseImage['small_image_url'] }}" />
                                         </div>
@@ -318,7 +316,7 @@
                                 <li>
                                     <a href="{{ route('admin.catalog.products.edit', $item->product_id) }}">
                                         <div class="image">
-                                            <?php $productBaseImage = $productImageHelper->getProductBaseImage($item->product); ?>
+                                            <?php $productBaseImage = ProductImage::getProductBaseImage($item->product); ?>
 
                                             <img class="item-image" src="{{ $productBaseImage['small_image_url'] }}" />
                                         </div>
diff --git a/packages/Webkul/Product/src/Helpers/ConfigurableOption.php b/packages/Webkul/Product/src/Helpers/ConfigurableOption.php
index 004ede9e5..ef0ca45b3 100755
--- a/packages/Webkul/Product/src/Helpers/ConfigurableOption.php
+++ b/packages/Webkul/Product/src/Helpers/ConfigurableOption.php
@@ -7,24 +7,6 @@ use Webkul\Product\Models\ProductAttributeValue;
 
 class ConfigurableOption extends AbstractProduct
 {
-    /**
-     * ProductImage object
-     *
-     * @var array
-     */
-    protected $productImage;
-
-    /**
-     * Create a new controller instance.
-     *
-     * @param  \Webkul\Product\Helpers\ProductImage  $productImage
-     * @return void
-     */
-    public function __construct(ProductImage $productImage)
-    {
-        $this->productImage = $productImage;
-    }
-
     /**
      * Returns the allowed variants
      *
@@ -223,7 +205,7 @@ class ConfigurableOption extends AbstractProduct
                 $variantId = $variant->id;
             }
 
-            $images[$variantId] = $this->productImage->getGalleryImages($variant);
+            $images[$variantId] = ProductImage::getGalleryImages($variant);
         }
 
         return $images;
diff --git a/packages/Webkul/Product/src/Type/AbstractType.php b/packages/Webkul/Product/src/Type/AbstractType.php
index 5ac820274..76ef5491e 100644
--- a/packages/Webkul/Product/src/Type/AbstractType.php
+++ b/packages/Webkul/Product/src/Type/AbstractType.php
@@ -849,7 +849,7 @@ abstract class AbstractType
      */
     public function getBaseImage($item)
     {
-        return $this->productImageHelper->getProductBaseImage($item->product);
+        return ProductImage::getProductBaseImage($item->product);
     }
 
     /**
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
index d44caa83c..f14a10383 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
@@ -5,8 +5,6 @@
 @stop
 
 @section('content-wrapper')
-    @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
     <section class="cart">
         @if ($cart)
             <div class="title">
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php
index 4477af9b0..6750f8fdd 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php
@@ -1,5 +1,3 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
 <?php $cart = cart()->getCart(); ?>
 
 @if ($cart)
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
index 223514041..43950ef85 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
@@ -68,8 +68,6 @@
 
     </div>
 
-    @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
     <div class="cart-item-list mt-20">
         @foreach ($cart->items as $item)
             @php
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
index 28683a5c4..5f0c93482 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
@@ -1,5 +1,3 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
 @extends('shop::layouts.master')
 
 @section('page_title')
@@ -34,7 +32,7 @@
                     @foreach ($reviews as $review)
                         <div class="account-item-card mt-15 mb-15">
                             <div class="media-info">
-                                <?php $image = $productImageHelper->getProductBaseImage($review->product); ?>
+                                <?php $image = ProductImage::getProductBaseImage($review->product); ?>
                                 <a href="{{ route('shop.productOrCategory.index', $review->product->url_key) }}" title="{{ $review->product->name }}">
                                     <img class="media" src="{{ $image['small_image_url'] }}" alt=""/>
                                 </a>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php
index a86d410e1..45510ff65 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php
@@ -1,5 +1,3 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
 @extends('shop::layouts.master')
 
 @section('page_title')
@@ -21,7 +19,7 @@
                     @foreach ($reviews as $review)
                     <div class="account-item-card mt-15 mb-15">
                         <div class="media-info">
-                            <?php $image = $productImageHelper->getGalleryImages($review->product); ?>
+                            <?php $image = ProductImage::getGalleryImages($review->product); ?>
                             <img class="media" src="{{ $image[0]['small_image_url'] }}" alt="" />
 
                             <div class="info mt-20">
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
index 2ca3bd5a3..092db144d 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
@@ -6,8 +6,6 @@
 
 @section('content-wrapper')
     <div class="account-content">
-        @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
         @include('shop::customers.account.partials.sidemenu')
 
         @inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
index 270b15adf..f21663beb 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
@@ -2,9 +2,7 @@
 
 <div class="product-card">
 
-    @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
-    <?php $productBaseImage = $productImageHelper->getProductBaseImage($product); ?>
+    <?php $productBaseImage = ProductImage::getProductBaseImage($product); ?>
 
     @if ($product->new)
         <div class="sticker new">
diff --git a/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php b/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php
index 0c9abb250..969551510 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php
@@ -10,9 +10,8 @@
 
         <div class="review-layouter mb-20">
             <div class="product-info">
-                @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
 
-                <?php $productBaseImage = $productImageHelper->getProductBaseImage($product); ?>
+                <?php $productBaseImage = ProductImage::getProductBaseImage($product); ?>
 
                 <div class="product-image">
                     <a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" title="{{ $product->name }}">
diff --git a/packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php
index 074c5d58b..38cec95b3 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php
@@ -9,11 +9,9 @@
     <section class="review">
 
         <div class="review-layouter">
-            @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
             @inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
 
-            <?php $productBaseImage = $productImageHelper->getProductBaseImage($product); ?>
+            <?php $productBaseImage = ProductImage::getProductBaseImage($product); ?>
 
             <div class="product-info">
                 <div class="product-image">
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
index d0577d632..5f19c7788 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
@@ -15,7 +15,7 @@
         </script>
     @endif
 
-    <?php $productBaseImage = app('Webkul\Product\Helpers\ProductImage')->getProductBaseImage($product); ?>
+    <?php $productBaseImage = ProductImage::getProductBaseImage($product); ?>
 
     <meta name="twitter:card" content="summary_large_image" />
 
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php
index 7ffa5261b..e31c5553f 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php
@@ -1,13 +1,12 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
 @inject ('productVideoHelper', 'Webkul\Product\Helpers\ProductVideo')
 @inject ('wishListHelper', 'Webkul\Customer\Helpers\Wishlist')
 
-<?php 
-    $images = $productImageHelper->getGalleryImages($product); 
+<?php
+    $images = ProductImage::getGalleryImages($product);
 
     $videos = $productVideoHelper->getVideos($product);
 
-    $images = array_merge($images, $videos); 
+    $images = array_merge($images, $videos);
 ?>
 
 
diff --git a/packages/Webkul/Velocity/src/Helpers/Helper.php b/packages/Webkul/Velocity/src/Helpers/Helper.php
index 05ccf80a2..e93864c65 100644
--- a/packages/Webkul/Velocity/src/Helpers/Helper.php
+++ b/packages/Webkul/Velocity/src/Helpers/Helper.php
@@ -307,14 +307,13 @@ class Helper extends Review
     public function formatProduct($product, $list = false, $metaInformation = [])
     {
         $reviewHelper = app('Webkul\Product\Helpers\Review');
-        $productImageHelper = app('Webkul\Product\Helpers\ProductImage');
 
         $totalReviews = $reviewHelper->getTotalReviews($product);
 
         $avgRatings = ceil($reviewHelper->getAverageRating($product));
 
-        $galleryImages = $productImageHelper->getGalleryImages($product);
-        $productImage = $productImageHelper->getProductBaseImage($product)['medium_image_url'];
+        $galleryImages = ProductImage::getGalleryImages($product);
+        $productImage = ProductImage::getProductBaseImage($product)['medium_image_url'];
 
         $largeProductImageName = "large-product-placeholder.png";
         $mediumProductImageName = "meduim-product-placeholder.png";
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php
index 985b00e98..0391da071 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php
@@ -1,5 +1,4 @@
 @inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
 
 @extends('shop::layouts.master')
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
index 086e3a5dd..c4a089206 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
@@ -1,5 +1,3 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
 <div class="form-container review-checkout-conainer">
     <accordian :title="'{{ __('shop::app.checkout.onepage.summary') }}'" :active="true">
         <div class="form-header mb-30" slot="header">
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
index 93006c15d..f47353e88 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
@@ -1,5 +1,3 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
 @extends('shop::customers.account.index')
 
 @section('page_title')
@@ -33,7 +31,7 @@
                 <div class="row col-12 fs16">
                     <div class="col-12 row">
                         @php
-                            $image = $productImageHelper->getProductBaseImage($review->product);
+                            $image = ProductImage::getProductBaseImage($review->product);
                         @endphp
 
                         <a
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/home/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/home/index.blade.php
index c068c215f..fda9c1b70 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/home/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/home/index.blade.php
@@ -1,6 +1,5 @@
 @extends('shop::layouts.master')
 
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
 @inject ('productRatingHelper', 'Webkul\Product\Helpers\Review')
 
 @php
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
index 2602db7e8..1452c07be 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
@@ -1,6 +1,5 @@
 @inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
 @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
 
 @push('css')
     <style type="text/css">
@@ -21,15 +20,15 @@
     }
 
     if (isset($item)) {
-        $productBaseImage = $productImageHelper->getProductImage($item);
+        $productBaseImage = ProductImage::getProductImage($item);
     } else {
-        $productBaseImage = $productImageHelper->getProductBaseImage($product);
+        $productBaseImage = ProductImage::getProductBaseImage($product);
     }
 
     $totalReviews = $reviewHelper->getTotalReviews($product);
     $avgRatings = ceil($reviewHelper->getAverageRating($product));
 
-    $galleryImages = $productImageHelper->getGalleryImages($product);
+    $galleryImages = ProductImage::getGalleryImages($product);
     $priceHTML = view('shop::products.price', ['product' => $product])->render();
 
     $product->__set('priceHTML', $priceHTML);
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/reviews/create.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/reviews/create.blade.php
index 7d9883acd..d52609fdc 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/reviews/create.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/reviews/create.blade.php
@@ -1,5 +1,3 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
 @extends('shop::layouts.master')
 
 @section('page_title')
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
index b9fe70ce5..0640bca91 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
@@ -2,7 +2,6 @@
 
 @inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
 @inject ('customHelper', 'Webkul\Velocity\Helpers\Helper')
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
 
 @php
     $total = $reviewHelper->getTotalReviews($product);
@@ -11,7 +10,7 @@
     $avgStarRating = round($avgRatings);
 
     $productImages = [];
-    $images = $productImageHelper->getGalleryImages($product);
+    $images = ProductImage::getGalleryImages($product);
 
     foreach ($images as $key => $image) {
         array_push($productImages, $image['medium_image_url']);
@@ -33,7 +32,7 @@
         </script>
     @endif
 
-    <?php $productBaseImage = app('Webkul\Product\Helpers\ProductImage')->getProductBaseImage($product); ?>
+    <?php $productBaseImage = ProductImage::getProductBaseImage($product); ?>
 
     <meta name="twitter:card" content="summary_large_image" />
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/configurable-options.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/configurable-options.blade.php
index 5d33d0af3..c53da1811 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/configurable-options.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/configurable-options.blade.php
@@ -1,11 +1,10 @@
 @if (Webkul\Product\Helpers\ProductType::hasVariants($product->type))
 
     @inject ('configurableOptionHelper', 'Webkul\Product\Helpers\ConfigurableOption')
-    @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
 
     @php
         $config = $configurableOptionHelper->getConfigurationConfig($product);
-        $galleryImages = $productImageHelper->getGalleryImages($product);
+        $galleryImages = ProductImage::getGalleryImages($product);
     @endphp
 
     {!! view_render_event('bagisto.shop.products.view.configurable-options.before', ['product' => $product]) !!}
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/gallery.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/gallery.blade.php
index 246744653..483a892bd 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/gallery.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/gallery.blade.php
@@ -1,9 +1,8 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
 @inject ('productVideoHelper', 'Webkul\Product\Helpers\ProductVideo')
 @inject ('wishListHelper', 'Webkul\Customer\Helpers\Wishlist')
 
 @php
-    $images = $productImageHelper->getGalleryImages($product);
+    $images = ProductImage::getGalleryImages($product);
     $videos = $productVideoHelper->getVideos($product);
 
     $videoData = $imageData = [];
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/small-view.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/small-view.blade.php
index 92d3602ee..22d3d21a7 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/small-view.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/small-view.blade.php
@@ -1,7 +1,5 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
 @php
-    $productBaseImage = $productImageHelper->getProductBaseImage($product);
+    $productBaseImage = ProductImage::getProductBaseImage($product);
 @endphp
 
 <div class="col-lg-3 col-md-12">