diff --git a/Controllers/Settings.php b/Controllers/Settings.php
index 637c056..a9561fc 100644
--- a/Controllers/Settings.php
+++ b/Controllers/Settings.php
@@ -2,7 +2,7 @@
 
 namespace Leantime\Plugins\PluginTemplate\Controllers;
 
-use leantime\core\controller;
+use Leantime\Core\Controller\Controller;
 use Symfony\Component\HttpFoundation\Response;
 
 class Settings extends Controller
diff --git a/Middleware/GetLanguageAssets.php b/Middleware/GetLanguageAssets.php
index 9813bce..f188e2b 100644
--- a/Middleware/GetLanguageAssets.php
+++ b/Middleware/GetLanguageAssets.php
@@ -4,8 +4,8 @@
 
 use Closure;
 use Illuminate\Support\Facades\Cache;
-use Leantime\Core\Environment;
-use Leantime\Core\IncomingRequest;
+use Leantime\Core\Configuration\Environment;
+use Leantime\Core\Http\IncomingRequest;
 use Symfony\Component\HttpFoundation\Response;
 use Leantime\Core\Language;
 
diff --git a/Repositories/PluginTemplateRepository.php b/Repositories/PluginTemplateRepository.php
index ff8434e..6b9f383 100644
--- a/Repositories/PluginTemplateRepository.php
+++ b/Repositories/PluginTemplateRepository.php
@@ -3,7 +3,7 @@
 namespace Leantime\Plugins\PluginTemplate\Repositories;
 
 use Illuminate\Contracts\Container\BindingResolutionException;
-use \Leantime\Core\Db;
+use Leantime\Core\Db\Db;
 
 class PluginTemplateRepository
 {
@@ -12,10 +12,10 @@ class PluginTemplateRepository
     /**
      * @throws BindingResolutionException
      */
-    public function __construct()
+    public function __construct(Db $db)
     {
         // Get DB Instance
-        $this->db = app()->make(Db::class);
+        $this->db = $db;
     }
 
     // Repo methods here.
diff --git a/Services/PluginTemplate.php b/Services/PluginTemplate.php
index d18b3ef..8562b9e 100644
--- a/Services/PluginTemplate.php
+++ b/Services/PluginTemplate.php
@@ -6,12 +6,10 @@
 
 class PluginTemplate
 {
-    private PluginTemplateRepository $pluginTemplateRepos;
-
-    public function __construct()
-    {
-        $this->pluginTemplateRepos = new PluginTemplateRepository();
-    }
+    public function __construct(
+        private PluginTemplateRepository $pluginTemplateRepos
+    )
+    {}
 
     public function install(): void
     {
diff --git a/register.php b/register.php
index 2dbe5d2..36cca5f 100644
--- a/register.php
+++ b/register.php
@@ -1,5 +1,8 @@
 <?php
 
+use Leantime\Core\Events\EventDispatcher;
+use Leantime\Plugins\PluginTemplate\Middleware\GetLanguageAssets;
+
 //Listen to events
 
 function pluginTemplateListener(){
@@ -8,7 +11,7 @@ function pluginTemplateListener(){
 }
 
 //Register event listener
-\leantime\core\events::add_event_listener("core.template.tpl.pageparts.header.afterLinkTags", 'pluginTemplateListener');
+EventDispatcher::add_event_listener("core.template.tpl.pageparts.header.afterLinkTags", 'pluginTemplateListener');
 
 function pluginTemplateFilter($payload, $params){
 
@@ -22,7 +25,7 @@ function pluginTemplateFilter($payload, $params){
 }
 
 //Register event listener
-\leantime\core\events::add_filter_listener("filterListenerName", 'pluginTemplateFilter');
+EventDispatcher::add_filter_listener("filterListenerName", 'pluginTemplateFilter');
 
 
 //Example add menu point
@@ -36,11 +39,11 @@ function addExampleMenuItem($menuStructure)
 }
 
 //Register event listener
-\leantime\core\events::add_filter_listener("domain.menu.Repositories.menu.getMenuStructure.menuStructures", 'addExampleMenuItem');
+EventDispatcher::add_filter_listener("leantime.domain.menu.repositories.menu.getMenuStructure.menuStructures", 'addExampleMenuItem');
 
 
 //Register Language Assets
-\leantime\core\events::add_filter_listener(
+EventDispatcher::add_filter_listener(
     'leantime.core.httpkernel.handle.plugins_middleware',
     fn (array $middleware) => array_merge($middleware, [GetLanguageAssets::class]),
 );