diff --git a/app/Console/Commands/SetTemplate.php b/app/Console/Commands/SetTemplate.php
index f158b46d..462d5127 100644
--- a/app/Console/Commands/SetTemplate.php
+++ b/app/Console/Commands/SetTemplate.php
@@ -42,7 +42,7 @@ class SetTemplate extends Command
         $config['staticName'] = $template;
 
         if ($current) {
-            $info = json_decode($current->moduleSettings);
+            $info = json_decode($current->module_settings);
 
             $this->line('Template is already installed. Currently using template ' . trans($current->name) . ' located in /templates/' . $info->staticName . '.');
             $confirm = $this->confirm('Uninstall it and install *' . trans($config['name']) . '*? All data associated with installed template will be lost!');
diff --git a/templates/Binarity/Handler.php b/templates/Binarity/Handler.php
index f0e6df10..190e2350 100644
--- a/templates/Binarity/Handler.php
+++ b/templates/Binarity/Handler.php
@@ -1,12 +1,12 @@
 <?php
 namespace Templates\Binarity;
 
-use App\CMS\Handlers\Contracts\TemplateHandler;
+use App\CMS\Contracts\Modules\TemplateHandler;
 use App\Http\Requests\Request;
 use App\Models\Content\Content;
 use App\Models\Module;
 use App\Models\User;
-use App\Models\WidgetArea;
+use App\Models\Widgets\WidgetArea;
 use Templates\Binarity\Shortcodes\DarkBlock;
 use Templates\Binarity\Shortcodes\TechnologiesWrapper;
 use Templates\Binarity\Shortcodes\Technology;
@@ -112,9 +112,9 @@ class Handler implements TemplateHandler
      * This way we can do almost whatever we want - even in template
      *
      * @param Content $content
-     * @param Request $request
+     * @param $request
      */
-    public static function beforeSave(Content & $content, Request $request)
+    public static function beforeSave(Content & $content, $inputData)
     {
     }
 }
\ No newline at end of file