diff --git a/app/src/MainWindow.cpp b/app/src/MainWindow.cpp
index dacf81f..14b07ad 100644
--- a/app/src/MainWindow.cpp
+++ b/app/src/MainWindow.cpp
@@ -32,7 +32,6 @@
 #include <SqpApplication.h>
 #include <Time/TimeController.h>
 #include <TimeWidget/TimeWidget.h>
-#include <Variable/Variable.h>
 #include <Visualization/VisualizationController.h>
 
 #include <QAction>
diff --git a/core b/core
index ae48b17..cc26524 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit ae48b17833443bc2730a7511f964569dc7cdb1df
+Subproject commit cc26524fb5d10feca3820e6921c9cd3cfb1a3591
diff --git a/gui/src/DragAndDrop/DragDropGuiController.cpp b/gui/src/DragAndDrop/DragDropGuiController.cpp
index 29c2e7d..e0f077b 100644
--- a/gui/src/DragAndDrop/DragDropGuiController.cpp
+++ b/gui/src/DragAndDrop/DragDropGuiController.cpp
@@ -8,7 +8,6 @@
 #include "Visualization/operations/FindVariableOperation.h"
 
 #include "DataSource/DataSourceController.h"
-#include "Variable/Variable.h"
 #include "Variable/VariableController2.h"
 
 #include "Common/MimeTypesDef.h"
@@ -256,7 +255,7 @@ bool DragDropGuiController::checkMimeDataForVisualization(
     if (mimeData->hasFormat(MIME_TYPE_VARIABLE_LIST))
     {
         auto variables = sqpApp->variableController().variables(
-            Variable::variablesIDs(mimeData->data(MIME_TYPE_VARIABLE_LIST)));
+            Variable2::IDs(mimeData->data(MIME_TYPE_VARIABLE_LIST)));
 
         if (variables.size() == 1)
         {
diff --git a/gui/src/SqpApplication.cpp b/gui/src/SqpApplication.cpp
index 7b50243..6d15918 100644
--- a/gui/src/SqpApplication.cpp
+++ b/gui/src/SqpApplication.cpp
@@ -8,7 +8,6 @@
 #include <Network/NetworkController.h>
 #include <QThread>
 #include <Time/TimeController.h>
-#include <Variable/Variable.h>
 #include <Variable/VariableController2.h>
 #include <Variable/VariableModel2.h>
 #include <Visualization/VisualizationController.h>
diff --git a/gui/src/Variable/VariableInspectorWidget.cpp b/gui/src/Variable/VariableInspectorWidget.cpp
index f3e75f3..ac45b4e 100644
--- a/gui/src/Variable/VariableInspectorWidget.cpp
+++ b/gui/src/Variable/VariableInspectorWidget.cpp
@@ -1,6 +1,5 @@
 #include <DataSource/DataSourceController.h>
 #include <Variable/RenameVariableDialog.h>
-#include <Variable/Variable.h>
 #include <Variable/VariableController2.h>
 #include <Variable/VariableInspectorWidget.h>
 #include <Variable/VariableMenuHeaderWidget.h>
diff --git a/gui/src/Visualization/PlottablesRenderingUtils.cpp b/gui/src/Visualization/PlottablesRenderingUtils.cpp
index e9b0080..d2ca2fb 100644
--- a/gui/src/Visualization/PlottablesRenderingUtils.cpp
+++ b/gui/src/Visualization/PlottablesRenderingUtils.cpp
@@ -2,10 +2,6 @@
 
 #include <Common/ColorUtils.h>
 
-#include <Data/ScalarSeries.h>
-#include <Data/SpectrogramSeries.h>
-#include <Data/VectorSeries.h>
-
 #include <Variable/Variable2.h>
 
 #include <Visualization/qcustomplot.h>
@@ -133,5 +129,5 @@ std::unique_ptr<IPlottablesHelper> IPlottablesHelperFactory::create(Variable2& v
             break;
     }
 
-    return std::make_unique<PlottablesHelper<IDataSeries>>();
+    return std::make_unique<PlottablesHelper<TimeSeries::ITimeSerie>>();
 }
diff --git a/gui/src/Visualization/SqpColorScale.cpp b/gui/src/Visualization/SqpColorScale.cpp
index 47b91f4..d0afa5a 100644
--- a/gui/src/Visualization/SqpColorScale.cpp
+++ b/gui/src/Visualization/SqpColorScale.cpp
@@ -1,40 +1,41 @@
 #include "Visualization/SqpColorScale.h"
 
-#include <Data/DataSeriesUtils.h>
-
 #include <Visualization/QCPColorMapIterator.h>
 
 Q_LOGGING_CATEGORY(LOG_SqpColorScale, "SqpColorScale")
 
-namespace {
+namespace
+{
 
 const auto DEFAULT_GRADIENT_PRESET = QCPColorGradient::gpJet;
-const auto DEFAULT_RANGE = QCPRange{1.0e3, 1.7e7};
+const auto DEFAULT_RANGE = QCPRange { 1.0e3, 1.7e7 };
 
 } // namespace
 
-std::pair<double, double> SqpColorScale::computeThresholds(const SqpColorScale &scale)
+std::pair<double, double> SqpColorScale::computeThresholds(const SqpColorScale& scale)
 {
     auto qcpScale = scale.m_Scale;
 
     auto colorMaps = qcpScale->colorMaps();
-    if (colorMaps.size() != 1) {
-        return {std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN()};
+    if (colorMaps.size() != 1)
+    {
+        return { std::numeric_limits<double>::quiet_NaN(),
+            std::numeric_limits<double>::quiet_NaN() };
     }
 
     // Computes thresholds
     auto isLogarithmicScale = qcpScale->dataScaleType() == QCPAxis::stLogarithmic;
     auto colorMapData = colorMaps.first()->data();
-    QCPColorMapIterator begin{colorMapData, true};
-    QCPColorMapIterator end{colorMapData, false};
+    QCPColorMapIterator begin { colorMapData, true };
+    QCPColorMapIterator end { colorMapData, false };
 
-    return DataSeriesUtils::thresholds(begin, end, isLogarithmicScale);
+    return {}; // DataSeriesUtils::thresholds(begin, end, isLogarithmicScale);
 }
 
-SqpColorScale::SqpColorScale(QCustomPlot &plot)
-        : m_Scale{new QCPColorScale{&plot}},
-          m_AutomaticThreshold{false},
-          m_GradientPreset{DEFAULT_GRADIENT_PRESET}
+SqpColorScale::SqpColorScale(QCustomPlot& plot)
+        : m_Scale { new QCPColorScale { &plot } }
+        , m_AutomaticThreshold { false }
+        , m_GradientPreset { DEFAULT_GRADIENT_PRESET }
 {
     m_Scale->setGradient(m_GradientPreset);
     m_Scale->setDataRange(DEFAULT_RANGE);
@@ -43,18 +44,20 @@ SqpColorScale::SqpColorScale(QCustomPlot &plot)
 void SqpColorScale::updateDataRange() noexcept
 {
     // Updates data range only if mode is automatic
-    if (!m_AutomaticThreshold) {
+    if (!m_AutomaticThreshold)
+    {
         return;
     }
 
     double minThreshold, maxThreshold;
     std::tie(minThreshold, maxThreshold) = computeThresholds(*this);
-    if (std::isnan(minThreshold) || std::isnan(maxThreshold)) {
+    if (std::isnan(minThreshold) || std::isnan(maxThreshold))
+    {
         qCCritical(LOG_SqpColorScale())
             << "Can't update data range of color scale: thresholds computed are invalid";
         return;
     }
 
     // Updates thresholds
-    m_Scale->setDataRange({minThreshold, maxThreshold});
+    m_Scale->setDataRange({ minThreshold, maxThreshold });
 }
diff --git a/gui/src/Visualization/VisualizationGraphHelper.cpp b/gui/src/Visualization/VisualizationGraphHelper.cpp
index 1479eb7..da62da8 100644
--- a/gui/src/Visualization/VisualizationGraphHelper.cpp
+++ b/gui/src/Visualization/VisualizationGraphHelper.cpp
@@ -1,7 +1,6 @@
 #include "Visualization/VisualizationGraphHelper.h"
 #include "Visualization/qcustomplot.h"
 
-#include <Data/DataSeriesUtils.h>
 #include <Data/ScalarTimeSerie.h>
 #include <Data/SpectrogramTimeSerie.h>
 #include <Data/VectorTimeSerie.h>
diff --git a/gui/src/Visualization/VisualizationGraphRenderingDelegate.cpp b/gui/src/Visualization/VisualizationGraphRenderingDelegate.cpp
index c9b20db..64c1389 100644
--- a/gui/src/Visualization/VisualizationGraphRenderingDelegate.cpp
+++ b/gui/src/Visualization/VisualizationGraphRenderingDelegate.cpp
@@ -8,9 +8,6 @@
 
 #include <Common/DateUtils.h>
 
-#include <Data/IDataSeries.h>
-#include <Variable/Variable.h>
-
 #include <SqpApplication.h>
 
 namespace
diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp
index 7fb9525..1465322 100644
--- a/gui/src/Visualization/VisualizationGraphWidget.cpp
+++ b/gui/src/Visualization/VisualizationGraphWidget.cpp
@@ -15,10 +15,7 @@
 #include <Actions/FilteringAction.h>
 #include <Common/MimeTypesDef.h>
 #include <Common/containers.h>
-#include <Data/ArrayData.h>
 #include <Data/DateTimeRangeHelper.h>
-#include <Data/IDataSeries.h>
-#include <Data/SpectrogramSeries.h>
 #include <DragAndDrop/DragDropGuiController.h>
 #include <Settings/SqpSettingsDefs.h>
 #include <SqpApplication.h>
diff --git a/gui/tests/GUITestUtils/GUITestUtils.h b/gui/tests/GUITestUtils/GUITestUtils.h
index 628727c..e26018d 100644
--- a/gui/tests/GUITestUtils/GUITestUtils.h
+++ b/gui/tests/GUITestUtils/GUITestUtils.h
@@ -10,7 +10,6 @@
 #include <QtTest>
 
 #include <SqpApplication.h>
-#include <Variable/Variable.h>
 #include <Variable/VariableController2.h>
 #include <qcustomplot.h>