diff --git a/server/lib/network/Session/Session.cpp b/server/lib/network/Session/Session.cpp
index 7f2023a254b795040c6d5a75982ad707aa60e85f..d773f68068c5014a923e7b9becce1ea4a78894dc 100644
--- a/server/lib/network/Session/Session.cpp
+++ b/server/lib/network/Session/Session.cpp
@@ -36,9 +36,6 @@ void Session::do_read() {
                           length - 2,
                       std::ostream_iterator<char>(ss_out));
 
-            // std::istream istrm(&request_buffer);
-            // std::string  result;
-            // istrm >> result;
             std::string result = ss_out.str();
             request_buffer.consume(length);
 
diff --git a/server/lib/plugins/PluginsLoader/PluginsLoader.hpp b/server/lib/plugins/PluginsLoader/PluginsLoader.hpp
index 5597031bc69df2e878ba147da1d9354d5025b962..ec2eec64a92baa64ef5a89807ff03b8a7462dc11 100644
--- a/server/lib/plugins/PluginsLoader/PluginsLoader.hpp
+++ b/server/lib/plugins/PluginsLoader/PluginsLoader.hpp
@@ -1,7 +1,6 @@
 #ifndef PLUGINS_LOADER_H
 #define PLUGINS_LOADER_H
 
-#include "BasePluginWrapper.hpp"
 #include "spdlog/common.h"
 #include "spdlog/spdlog.h"
 #include <boost/python/errors.hpp>
@@ -18,6 +17,7 @@
 #include <utility>
 #include <variant>
 
+#include "IPluginWrapper.hpp"
 #include "PyExceptionInfo.hpp"
 
 template <typename Wrapper>
diff --git a/server/lib/plugins/PluginsProvider/PluginsProvider.hpp b/server/lib/plugins/PluginsProvider/PluginsProvider.hpp
index d85c5a16c7a5646a70bd9276b9f9e345d4b57af7..0d8e86cfb5669d81d004f683a17495eb7bb15668 100644
--- a/server/lib/plugins/PluginsProvider/PluginsProvider.hpp
+++ b/server/lib/plugins/PluginsProvider/PluginsProvider.hpp
@@ -67,11 +67,13 @@ class PluginsProvider : public IPluginsProvider {
     auto load_new_plugins() -> void override;
 
  private:
-    PluginsLoader<DefinitionsProviderWrapper> definitions_providers_;
-    PluginsLoader<SentencesProviderWrapper>   sentences_providers_;
-    PluginsLoader<ImagesProviderWrapper>      images_providers_;
-    PluginsLoader<AudiosProviderWrapper>      audios_providers_;
-    PluginsLoader<FormatProcessorWrapper>     format_processors_;
+    std::unique_ptr<IPluginsLoader<DefinitionsProviderWrapper>>
+        definitions_providers_;
+    std::unique_ptr<IPluginsLoader<SentencesProviderWrapper>>
+                                                           sentences_providers_;
+    std::unique_ptr<IPluginsLoader<ImagesProviderWrapper>> images_providers_;
+    std::unique_ptr<IPluginsLoader<AudiosProviderWrapper>> audios_providers_;
+    std::unique_ptr<IPluginsLoader<FormatProcessorWrapper>> format_processors_;
 };
 
 #endif  // !PLUGINS_PROVIDER_H
diff --git a/server/lib/plugins/wrappers/interfaces/IPluginWrapper/IPluginWrapper.hpp b/server/lib/plugins/wrappers/interfaces/IPluginWrapper/IPluginWrapper.hpp
index a48d7c09910f88c81ed5b97a481e18604995a307..8a6030cc05c9fbbe70ce0f0de621327483f54d4f 100644
--- a/server/lib/plugins/wrappers/interfaces/IPluginWrapper/IPluginWrapper.hpp
+++ b/server/lib/plugins/wrappers/interfaces/IPluginWrapper/IPluginWrapper.hpp
@@ -29,6 +29,7 @@ class IPluginWrapper {
 
 template <typename T>
 concept is_plugin_wrapper =
+    std::derived_from<T, IPluginWrapper> &&
     requires(T                            instance,
              const std::string           &name,
              const boost::python::object &module) {