diff --git a/src/ATBAPP/ATBAPPplugin.h b/src/ATBAPP/ATBAPPplugin.h
index 11fcadf..cd356db 100644
--- a/src/ATBAPP/ATBAPPplugin.h
+++ b/src/ATBAPP/ATBAPPplugin.h
@@ -7,6 +7,9 @@
 #include <QObject>
 #include <QStringList>
 
+class UnifiedDCVMCInterface;
+
+template <typename T>
 struct ATBAPPplugin {
     enum class PLUGIN_STATE : quint8 {
         NOT_INITIALIZED = 0,
@@ -54,14 +57,14 @@ struct ATBAPPplugin {
     }
 };
 
-using PLUGIN_STATE = ATBAPPplugin::PLUGIN_STATE;
-using RESULT_STATE = ATBAPPplugin::RESULT_STATE;
-using CASH_STATE = ATBAPPplugin::CASH_STATE;
-using TICKET_VARIANT = ATBAPPplugin::TICKET_VARIANT;
-using STEP = ATBAPPplugin::STEP;
-using TERMINAL_STATE = ATBAPPplugin::TERMINAL_STATE;
+using PLUGIN_STATE = ATBAPPplugin<UnifiedDCVMCInterface>::PLUGIN_STATE;
+using RESULT_STATE = ATBAPPplugin<UnifiedDCVMCInterface>::RESULT_STATE;
+using CASH_STATE = ATBAPPplugin<UnifiedDCVMCInterface>::CASH_STATE;
+using TICKET_VARIANT = ATBAPPplugin<UnifiedDCVMCInterface>::TICKET_VARIANT;
+using STEP = ATBAPPplugin<UnifiedDCVMCInterface>::STEP;
+using TERMINAL_STATE = ATBAPPplugin<UnifiedDCVMCInterface>::TERMINAL_STATE;
 
-Q_DECLARE_INTERFACE(ATBAPPplugin,
-                    "eu.atb.ptu.plugin.ATBAPPplugin/0.9")
+//Q_DECLARE_INTERFACE(ATBAPPplugin,
+//                    "eu.atb.ptu.plugin.ATBAPPplugin/0.9")
 
 #endif // ATBAPPPLUGIN_H
diff --git a/src/ATBAPP/UnifiedDCVMCInterface.h b/src/ATBAPP/UnifiedDCVMCInterface.h
index 18d0262..3e1dcb0 100644
--- a/src/ATBAPP/UnifiedDCVMCInterface.h
+++ b/src/ATBAPP/UnifiedDCVMCInterface.h
@@ -12,9 +12,9 @@
 #include "ATBAPPplugin.h"
 
 
-class UnifiedDCVMCInterface : public ATBAPPplugin {
-    Q_INTERFACES(ATBAPPplugin)
-    Q_CLASSINFO("Interface", "ATBAPPplugin")
+class UnifiedDCVMCInterface : public ATBAPPplugin<UnifiedDCVMCInterface> {
+    //Q_INTERFACES(ATBAPPplugin)
+    //Q_CLASSINFO("Interface", "ATBAPPplugin")
 
 public:
     explicit UnifiedDCVMCInterface() = default;
@@ -45,7 +45,7 @@ public:
 
     virtual QString const &getString(RESULT_STATE resultState) = 0;
 
-public slots:
+//public slots:
     virtual void onChangedProgramModeToSELL() = 0;
     virtual void onChangedProgramModeToSERVICE() = 0;
     virtual void onChangedProgramModeToIDLE() = 0;
@@ -57,7 +57,7 @@ public slots:
     virtual void reset() = 0;
 };
 
-Q_DECLARE_INTERFACE(UnifiedDCVMCInterface,
-                    "eu.atb.ptu.plugin.UnifiedDCVMCInterface/1.0")
+//Q_DECLARE_INTERFACE(UnifiedDCVMCInterface,
+//                    "eu.atb.ptu.plugin.UnifiedDCVMCInterface/1.0")
 
 #endif // UNIFIED_DCVMC_INTERFACE_H_INCLUDED
diff --git a/src/ATBAPP/VMCInterface.h b/src/ATBAPP/VMCInterface.h
index 9dcb430..7607d1f 100644
--- a/src/ATBAPP/VMCInterface.h
+++ b/src/ATBAPP/VMCInterface.h
@@ -20,9 +20,10 @@ namespace nsVMCInterface {
 class VMCInterface : public QObject, public UnifiedDCVMCInterface {
 
     Q_OBJECT
-    Q_INTERFACES(ATBAPPplugin UnifiedDCVMCInterface)
-    Q_CLASSINFO("Interface", "ATBAPPplugin")
-    Q_CLASSINFO("Interface", "UnifiedDCVMCInterface")
+    //Q_INTERFACES(ATBAPPplugin UnifiedDCVMCInterface)
+    //Q_INTERFACES(UnifiedDCVMCInterface)
+    //Q_CLASSINFO("Interface", "ATBAPPplugin")
+    //Q_CLASSINFO("Interface", "UnifiedDCVMCInterface")
 public:
 
     explicit VMCInterface(QObject *parent = nullptr) : QObject(parent) {}