diff --git a/core/include/Variable/VariableAcquisitionWorker.h b/core/include/Variable/VariableAcquisitionWorker.h
index c48e2e5..1cdb82e 100644
--- a/core/include/Variable/VariableAcquisitionWorker.h
+++ b/core/include/Variable/VariableAcquisitionWorker.h
@@ -8,7 +8,7 @@
 #include <QObject>
 #include <QUuid>
 
-#include <Data/SqpDateTime.h>
+#include <Data/SqpRange.h>
 
 #include <QLoggingCategory>
 
diff --git a/core/src/Variable/VariableAcquisitionWorker.cpp b/core/src/Variable/VariableAcquisitionWorker.cpp
index 9ffa202..8e7ead9 100644
--- a/core/src/Variable/VariableAcquisitionWorker.cpp
+++ b/core/src/Variable/VariableAcquisitionWorker.cpp
@@ -8,7 +8,7 @@ Q_LOGGING_CATEGORY(LOG_VariableAcquisitionWorker, "VariableAcquisitionWorker")
 
 struct VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate {
 
-    std::unordered_map<std::shared_ptr<Variable>, QVector<SqpDateTime> >
+    std::unordered_map<std::shared_ptr<Variable>, QVector<SqpRange> >
         m_VariableToSqpDateTimeListMap;
 };
 
diff --git a/core/src/Variable/VariableController.cpp b/core/src/Variable/VariableController.cpp
index 4447832..e27b918 100644
--- a/core/src/Variable/VariableController.cpp
+++ b/core/src/Variable/VariableController.cpp
@@ -26,8 +26,8 @@ struct VariableController::VariableControllerPrivate {
     {
     }
 
-    QVector<SqpDateTime> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable,
-                                                       const SqpDateTime &dateTime);
+    QVector<SqpRange> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable,
+                                                    const SqpRange &dateTime);
 
     QMutex m_WorkingMutex;
     /// Variable model. The VariableController has the ownership
@@ -246,10 +246,10 @@ void VariableController::waitForFinish()
 }
 
 
-QVector<SqpDateTime> VariableController::VariableControllerPrivate::provideNotInCacheDateTimeList(
-    std::shared_ptr<Variable> variable, const SqpDateTime &dateTime)
+QVector<SqpRange> VariableController::VariableControllerPrivate::provideNotInCacheDateTimeList(
+    std::shared_ptr<Variable> variable, const SqpRange &dateTime)
 {
-    auto notInCache = QVector<SqpDateTime>{};
+    auto notInCache = QVector<SqpRange>{};
 
     if (!variable->contains(dateTime)) {
         auto vDateTime = variable->dateTime();
@@ -257,14 +257,14 @@ QVector<SqpDateTime> VariableController::VariableControllerPrivate::provideNotIn
             notInCache << dateTime;
         }
         else if (dateTime.m_TStart < vDateTime.m_TStart && dateTime.m_TEnd <= vDateTime.m_TEnd) {
-            notInCache << SqpDateTime{dateTime.m_TStart, vDateTime.m_TStart};
+            notInCache << SqpRange{dateTime.m_TStart, vDateTime.m_TStart};
         }
         else if (dateTime.m_TStart < vDateTime.m_TStart && dateTime.m_TEnd > vDateTime.m_TEnd) {
-            notInCache << SqpDateTime{dateTime.m_TStart, vDateTime.m_TStart}
-                       << SqpDateTime{vDateTime.m_TEnd, dateTime.m_TStart};
+            notInCache << SqpRange{dateTime.m_TStart, vDateTime.m_TStart}
+                       << SqpRange{vDateTime.m_TEnd, dateTime.m_TStart};
         }
         else if (dateTime.m_TStart < vDateTime.m_TEnd) {
-            notInCache << SqpDateTime{vDateTime.m_TEnd, dateTime.m_TStart};
+            notInCache << SqpRange{vDateTime.m_TEnd, dateTime.m_TStart};
         }
         else {
             qCCritical(LOG_VariableController()) << tr("Detection of unknown case.")