diff --git a/composer.json b/composer.json
index 6a6657333..62035f4ba 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,8 @@
 		"doctrine/dbal": "^2.10",
 		"laravel/legacy-factories": "^1.0",
 		"illuminate/macroable": "^8.0",
-        	"symfony/finder": "^3.4|^4.0|^5.0"
+		"symfony/finder": "^3.4|^4.0|^5.0",
+		"darkghosthunter/rememberable-query": "^1.1"
 	},
 	"require-dev" : {
 		"phpunit/phpunit": "^8.0|^9.0",
diff --git a/resources/components/order/order/OrderShow.vue b/resources/components/order/order/OrderShow.vue
index 4a871c551..28f2d4d42 100644
--- a/resources/components/order/order/OrderShow.vue
+++ b/resources/components/order/order/OrderShow.vue
@@ -1,11 +1,11 @@
 <script>
-import VueSimplemde from 'vue-simplemde'
+import VueEasymde from 'vue-easymde'
 
 
 export default {
   props: [],
   components: {
-    'vue-simplemde': VueSimplemde
+    'vue-easymde': VueEasymde
   },
   data() {
     return {
diff --git a/resources/views/order/order/show.blade.php b/resources/views/order/order/show.blade.php
index 8632cfdaa..eda26e505 100644
--- a/resources/views/order/order/show.blade.php
+++ b/resources/views/order/order/show.blade.php
@@ -165,7 +165,7 @@
                                 {{ __('avored::system.comment') }}
                             </label>
                             <div class="mt-1">
-                                <vue-simplemde name="content" ref="markdownEditor" />
+                                <vue-easymde name="content" ref="markdownEditor" />
                             </div>
                         </div>
                         <div class="mt-3">
diff --git a/src/AvoRedProvider.php b/src/AvoRedProvider.php
index b990f3a51..7914b0381 100644
--- a/src/AvoRedProvider.php
+++ b/src/AvoRedProvider.php
@@ -4,7 +4,6 @@
 
 use AvoRed\Assets\AssetItem;
 use AvoRed\Assets\Support\Facades\Asset;
-use AvoRed\Framework\Support\Providers\BladeProvider;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
@@ -12,11 +11,9 @@
 use AvoRed\Framework\Support\Middleware\AvoRedCore;
 use AvoRed\Framework\Support\Console\InstallCommand;
 use AvoRed\Framework\Support\Console\AdminMakeCommand;
-use AvoRed\Framework\Support\Directive\AvoRedDirective;
 use AvoRed\Framework\Support\Middleware\Permission;
 use AvoRed\Framework\System\ViewComposers\LayoutComposer;
 use AvoRed\Framework\Support\Middleware\RedirectIfAdminAuth;
-use Illuminate\Support\Facades\Blade;
 
 class AvoRedProvider extends ServiceProvider
 {
@@ -30,7 +27,7 @@ class AvoRedProvider extends ServiceProvider
         \AvoRed\Framework\Support\Providers\CartProvider::class,
         \AvoRed\Framework\Support\Providers\EventServiceProvider::class,
         \AvoRed\Framework\Support\Providers\GraphqlProvider::class,
-        \AvoRed\Framework\Support\Providers\MenuProvider::class,
+        \AvoRed\Framework\Menu\MenuProvider::class,
         \AvoRed\Framework\Support\Providers\ModelProvider::class,
         \AvoRed\Framework\Support\Providers\PaymentProvider::class,
         \AvoRed\Framework\Support\Providers\PermissionProvider::class,
diff --git a/src/Database/Models/CategoryFilter.php b/src/Database/Models/CategoryFilter.php
index 017635c25..17a9a808d 100644
--- a/src/Database/Models/CategoryFilter.php
+++ b/src/Database/Models/CategoryFilter.php
@@ -40,9 +40,9 @@ public function category()
     public function getFilterAttribute()
     {
         if (self::PROPERTY_FILTER_TYPE === $this->type) {
-            return Property::find($this->filter_id);
+            return Property::where('id', $this->filter_id)->remember()->get()->first();
         } else {
-            return Attribute::find($this->filter_id);
+            return Attribute::where('id', $this->filter_id)->remember()->get()->first();
         }
     }
 }
diff --git a/src/Database/Models/Customer.php b/src/Database/Models/Customer.php
index d5ebd596c..72d6f5f6c 100644
--- a/src/Database/Models/Customer.php
+++ b/src/Database/Models/Customer.php
@@ -4,7 +4,7 @@
 
 use Laravel\Passport\HasApiTokens;
 use Illuminate\Notifications\Notifiable;
-use AvoRed\Framework\User\Notifications\ResetPassword;
+use AvoRed\Framework\User\Notifications\CustomerResetPassword;
 use Illuminate\Support\Facades\Hash;
 use Laravel\Passport\ClientRepository;
 
@@ -45,7 +45,7 @@ class Customer extends BaseModel
      */
     public function sendPasswordResetNotification($token)
     {
-        $this->notify(new ResetPassword($token));
+        $this->notify(new CustomerResetPassword($token));
     }
 
     /**
diff --git a/src/Database/Models/Property.php b/src/Database/Models/Property.php
index 153ae6e09..4dc2c0d8e 100644
--- a/src/Database/Models/Property.php
+++ b/src/Database/Models/Property.php
@@ -63,7 +63,7 @@ class Property extends BaseModel
     public function getDropdownAttribute()
     {
         if ($this->field_type === 'SELECT' || $this->field_type === 'RADIO') {
-            return $this->dropdownOptions;
+            return $this->dropdownOptions()->remember()->get();
         }
     }
 
diff --git a/src/Database/Repository/MenuGroupRepository.php b/src/Database/Repository/MenuGroupRepository.php
index 2ac9d3c3f..7e1611bc7 100644
--- a/src/Database/Repository/MenuGroupRepository.php
+++ b/src/Database/Repository/MenuGroupRepository.php
@@ -57,7 +57,7 @@ public function getTreeByIdentifier(string $identifier) : SupportCollection
         if ($menuGroup !== null) {
             $modelMenus = $menuGroup->menus()->whereNull('parent_id')->get();
             foreach ($modelMenus as $modelMenu) {
-                $modelMenu->submenus;
+                $modelMenu->submenus()->remember()->get();
                 $menus->push($modelMenu);
             }
         }
diff --git a/src/Support/Providers/MenuProvider.php b/src/Menu/MenuProvider.php
similarity index 97%
rename from src/Support/Providers/MenuProvider.php
rename to src/Menu/MenuProvider.php
index d9c7babb5..def84ab28 100644
--- a/src/Support/Providers/MenuProvider.php
+++ b/src/Menu/MenuProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace AvoRed\Framework\Support\Providers;
+namespace AvoRed\Framework\Menu;
 
 use AvoRed\Framework\Menu\MenuItem;
 use AvoRed\Framework\Menu\MenuBuilder;
@@ -31,7 +31,7 @@ public function boot()
     public function register()
     {
         $this->registerServices();
-        $this->app->alias('menu', 'AvoRed\Framework\Menu\MenuBuilder');
+        $this->app->alias('menu', MenuBuilder::class);
     }
 
     /**
@@ -54,7 +54,7 @@ function () {
      */
     public function provides()
     {
-        return ['menu', 'AvoRed\Framework\Menu\MenuBuilder'];
+        return ['menu', MenuBuilder::class];
     }
 
     /**
diff --git a/src/User/Notifications/CustomerResetPassword.php b/src/User/Notifications/CustomerResetPassword.php
new file mode 100644
index 000000000..db0bce63c
--- /dev/null
+++ b/src/User/Notifications/CustomerResetPassword.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace AvoRed\Framework\User\Notifications;
+
+use Illuminate\Notifications\Notification;
+use Illuminate\Notifications\Messages\MailMessage;
+
+class CustomerResetPassword extends Notification
+{
+    /**
+     * The password reset token.
+     *
+     * @var string
+     */
+    public $token;
+
+    /**
+     * Create a notification instance.
+     *
+     * @param  string $token
+     * @return void
+     */
+    public function __construct($token)
+    {
+        $this->token = $token;
+    }
+
+    /**
+     * Get the notification's channels.
+     *
+     * @param  mixed $notifiable
+     * @return array|string
+     */
+    public function via($notifiable)
+    {
+        return ['mail'];
+    }
+
+    /**
+     * Build the mail representation of the notification.
+     *
+     * @param  mixed $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        return (new MailMessage)
+            ->line('You are receiving this email because we received a password reset request for your account.')
+            ->action('Reset Password', route('password.reset', $this->token))
+            ->line('If you did not request a password reset, no further action is required.');
+    }
+}
diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
index 5e547ccad..e2deaf7eb 100644
--- a/tests/BaseTestCase.php
+++ b/tests/BaseTestCase.php
@@ -10,7 +10,7 @@
 use AvoRed\Framework\Database\Models\Currency;
 use Orchestra\Testbench\TestCase as OrchestraTestCase;
 
-class BaseTestCase extends OrchestraTestCase
+abstract class BaseTestCase extends OrchestraTestCase
 {
     /**
      * Admin User.