diff --git a/Core/Simulation/GISASSimulation.cpp b/Core/Simulation/GISASSimulation.cpp
index 3601d5ca0ac27923412aab81bb3110ee4f7c95bf..cb485219f577ddc7e4b03afa8f4d6b6bd37bb0e8 100644
--- a/Core/Simulation/GISASSimulation.cpp
+++ b/Core/Simulation/GISASSimulation.cpp
@@ -19,7 +19,6 @@
 #include "Histogram2D.h"
 #include "IMultiLayerBuilder.h"
 #include "MultiLayer.h"
-#include "SimElementUtils.h"
 #include "SimulationElement.h"
 
 namespace
@@ -114,23 +113,10 @@ void GISASSimulation::setRegionOfInterest(double xlow, double ylow, double xup,
 
 GISASSimulation::GISASSimulation(const GISASSimulation& other)
     : Simulation2D(other)
-    , m_storage(other.m_storage)
 {
     initialize();
 }
 
-void GISASSimulation::addDataToStorage(double weight)
-{
-    SimElementUtils::addElementsWithWeight(m_sim_elements, m_storage, weight);
-}
-
-void GISASSimulation::moveDataFromStorage()
-{
-    assert(!m_storage.empty());
-    if (!m_storage.empty())
-        m_sim_elements = std::move(m_storage);
-}
-
 void GISASSimulation::initSimulationElementVector(bool init_storage)
 {
     m_sim_elements = m_instrument.createSimulationElements();
diff --git a/Core/Simulation/GISASSimulation.h b/Core/Simulation/GISASSimulation.h
index d1aefee0ec717c4414e591431392277fedae3f21..b1066d03ad226258f449a81ace741cbd1388892f 100644
--- a/Core/Simulation/GISASSimulation.h
+++ b/Core/Simulation/GISASSimulation.h
@@ -92,14 +92,6 @@ private:
     void initSimulationElementVector(bool init_storage) override;
 
     void initialize();
-
-    bool isStorageInited() const override {return !m_storage.empty();}
-
-    void addDataToStorage(double weight) override;
-
-    void moveDataFromStorage() override;
-
-    std::vector<SimulationElement> m_storage;
 };
 
 #endif // GISASSIMULATION_H
diff --git a/Core/Simulation/OffSpecSimulation.cpp b/Core/Simulation/OffSpecSimulation.cpp
index ed09435d87a4d4bac42d0d8ff0c2e9b22885a7d9..48c0380fabb4e478eb80da0b682c47dd8af627ec 100644
--- a/Core/Simulation/OffSpecSimulation.cpp
+++ b/Core/Simulation/OffSpecSimulation.cpp
@@ -81,7 +81,6 @@ void OffSpecSimulation::setDetectorParameters(size_t n_x, double x_min, double x
 
 OffSpecSimulation::OffSpecSimulation(const OffSpecSimulation& other)
     : Simulation2D(other)
-    , m_storage(other.m_storage)
 {
     if(other.mP_alpha_i_axis)
         mP_alpha_i_axis.reset(other.mP_alpha_i_axis->clone());
@@ -111,18 +110,6 @@ void OffSpecSimulation::initSimulationElementVector(bool init_storage)
         m_storage = m_sim_elements;
 }
 
-void OffSpecSimulation::addDataToStorage(double weight)
-{
-    SimElementUtils::addElementsWithWeight(m_sim_elements, m_storage, weight);
-}
-
-void OffSpecSimulation::moveDataFromStorage()
-{
-    assert(!m_storage.empty());
-    if (!m_storage.empty())
-        m_sim_elements = std::move(m_storage);
-}
-
 void OffSpecSimulation::transferResultsToIntensityMap()
 {
     checkInitialization();
diff --git a/Core/Simulation/OffSpecSimulation.h b/Core/Simulation/OffSpecSimulation.h
index 404d2a427265fd0830c9d36b7e78626ead89ac8a..6b71f5012e68b359a598f4dc9a693906db4fca47 100644
--- a/Core/Simulation/OffSpecSimulation.h
+++ b/Core/Simulation/OffSpecSimulation.h
@@ -82,15 +82,8 @@ private:
 
     void initialize();
 
-    bool isStorageInited() const override {return !m_storage.empty();}
-
-    void addDataToStorage(double weight) override;
-
-    void moveDataFromStorage() override;
-
     std::unique_ptr<IAxis> mP_alpha_i_axis;
     OutputData<double> m_intensity_map;
-    std::vector<SimulationElement> m_storage;
 };
 
 #endif // OFFSPECSIMULATION_H
diff --git a/Core/Simulation/Simulation2D.cpp b/Core/Simulation/Simulation2D.cpp
index 28f4e71135a8171334fa28fc7009f681d31468f4..8c9ce69b5b6e7b9f61d65cc528e1dbfdb583d009 100644
--- a/Core/Simulation/Simulation2D.cpp
+++ b/Core/Simulation/Simulation2D.cpp
@@ -15,6 +15,7 @@
 #include "Simulation2D.h"
 #include "DWBAComputation.h"
 #include "IBackground.h"
+#include "SimElementUtils.h"
 #include "SimulationElement.h"
 
 Simulation2D::Simulation2D(const MultiLayer& p_sample)
@@ -28,6 +29,7 @@ Simulation2D::Simulation2D(const std::shared_ptr<IMultiLayerBuilder> p_sample_bu
 Simulation2D::Simulation2D(const Simulation2D& other)
     : Simulation(other)
     , m_sim_elements(other.m_sim_elements)
+    , m_storage(other.m_storage)
 {}
 
 std::unique_ptr<IComputation> Simulation2D::generateSingleThreadedComputation(size_t start,
@@ -58,3 +60,16 @@ void Simulation2D::addBackGroundIntensity(size_t start_ind, size_t n_elements)
         mP_background->addBackGround(element);
     }
 }
+
+void Simulation2D::addDataToStorage(double weight)
+{
+    SimElementUtils::addElementsWithWeight(m_sim_elements, m_storage, weight);
+}
+
+void Simulation2D::moveDataFromStorage()
+{
+    assert(!m_storage.empty());
+    if (!m_storage.empty())
+        m_sim_elements = std::move(m_storage);
+}
+
diff --git a/Core/Simulation/Simulation2D.h b/Core/Simulation/Simulation2D.h
index ed3b041e3c564f2a4d0f413db0c5612273ceca1b..5c4e39a1a4533c244066c514060a4071eaec0b09 100644
--- a/Core/Simulation/Simulation2D.h
+++ b/Core/Simulation/Simulation2D.h
@@ -42,9 +42,17 @@ protected:
 
     //! Normalize the intensity of the element with given index
     void normalizeIntensity(size_t index, double beam_intensity) override;
-    std::vector<SimulationElement> m_sim_elements;
 
     void addBackGroundIntensity(size_t start_ind, size_t n_elements) override;
+
+    bool isStorageInited() const override {return !m_storage.empty();}
+
+    void addDataToStorage(double weight) override;
+
+    void moveDataFromStorage() override;
+
+    std::vector<SimulationElement> m_sim_elements;
+    std::vector<SimulationElement> m_storage;
 };
 
 #endif // SIMULATION2D_H