diff --git a/gui/include/Visualization/GraphPlottablesFactory.h b/gui/include/Visualization/GraphPlottablesFactory.h
index 82c06ac..deaa485 100644
--- a/gui/include/Visualization/GraphPlottablesFactory.h
+++ b/gui/include/Visualization/GraphPlottablesFactory.h
@@ -4,6 +4,8 @@
 #include <QLoggingCategory>
 #include <QVector>
 
+#include <memory>
+
 Q_DECLARE_LOGGING_CATEGORY(LOG_GraphPlottablesFactory)
 
 class QCPAbstractPlottable;
@@ -23,7 +25,7 @@ struct GraphPlottablesFactory {
      * components.
      * @return the list of the components created
      */
-    static QVector<QCPAbstractPlottable *> create(const Variable *variable,
+    static QVector<QCPAbstractPlottable *> create(std::shared_ptr<Variable> variable,
                                                   QCustomPlot &plot) noexcept;
 };
 
diff --git a/gui/src/Visualization/GraphPlottablesFactory.cpp b/gui/src/Visualization/GraphPlottablesFactory.cpp
index 89a3e01..ab384a9 100644
--- a/gui/src/Visualization/GraphPlottablesFactory.cpp
+++ b/gui/src/Visualization/GraphPlottablesFactory.cpp
@@ -66,7 +66,7 @@ QCPAbstractPlottable *createScalarSeriesComponent(ScalarSeries &scalarSeries, QC
 
 } // namespace
 
-QVector<QCPAbstractPlottable *> GraphPlottablesFactory::create(const Variable *variable,
+QVector<QCPAbstractPlottable *> GraphPlottablesFactory::create(std::shared_ptr<Variable> variable,
                                                                QCustomPlot &plot) noexcept
 {
     auto result = QVector<QCPAbstractPlottable *>{};
diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp
index ea311cf..cfe0b03 100644
--- a/gui/src/Visualization/VisualizationGraphWidget.cpp
+++ b/gui/src/Visualization/VisualizationGraphWidget.cpp
@@ -45,7 +45,7 @@ VisualizationGraphWidget::~VisualizationGraphWidget()
 void VisualizationGraphWidget::addVariable(std::shared_ptr<Variable> variable)
 {
     // Uses delegate to create the qcpplot components according to the variable
-    auto createdPlottables = GraphPlottablesFactory::create(variable.get(), *ui->widget);
+    auto createdPlottables = GraphPlottablesFactory::create(variable, *ui->widget);
 
     for (auto createdPlottable : qAsConst(createdPlottables)) {
         impl->m_VariableToPlotMap.insert({variable, createdPlottable});