diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index c313dc8d0..7e41217a8 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -74,6 +74,7 @@ list (APPEND MAIN_SOURCE_FILES
   opm/simulators/timestepping/gatherConvergenceReport.cpp
   opm/simulators/utils/DeferredLogger.cpp
   opm/simulators/utils/gatherDeferredLogger.cpp
+  opm/simulators/utils/MPIPacker.cpp
   opm/simulators/utils/ParallelFileMerger.cpp
   opm/simulators/utils/ParallelRestart.cpp
   opm/simulators/wells/ALQState.cpp
@@ -180,7 +181,7 @@ list (APPEND TEST_SOURCE_FILES
 
 if(MPI_FOUND)
   list(APPEND TEST_SOURCE_FILES tests/test_parallelistlinformation.cpp
-                                tests/test_ParallelRestart.cpp)
+                                tests/test_ParallelSerialization.cpp)
 endif()
 if(CUDA_FOUND)
   list(APPEND TEST_SOURCE_FILES tests/test_cusparseSolver.cpp)
diff --git a/ebos/eclmpiserializer.hh b/ebos/eclmpiserializer.hh
index 37f67c39b..58bd8a8aa 100644
--- a/ebos/eclmpiserializer.hh
+++ b/ebos/eclmpiserializer.hh
@@ -21,8 +21,8 @@
 #ifndef ECL_MPI_SERIALIZER_HH
 #define ECL_MPI_SERIALIZER_HH
 
+#include <opm/simulators/utils/MPIPacker.hpp>
 #include <opm/simulators/utils/ParallelCommunication.hpp>
-#include <opm/simulators/utils/ParallelRestart.hpp>
 
 #include <optional>
 #include <type_traits>
diff --git a/opm/simulators/utils/MPIPacker.cpp b/opm/simulators/utils/MPIPacker.cpp
new file mode 100644
index 000000000..6874d6d5f
--- /dev/null
+++ b/opm/simulators/utils/MPIPacker.cpp
@@ -0,0 +1,739 @@
+/*
+  Copyright 2019 Equinor AS.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include <config.h>
+#include "MPIPacker.hpp"
+
+#include <cstdint>
+#include <cstring>
+#include <ctime>
+
+#include <dune/common/parallel/mpitraits.hh>
+#if HAVE_MPI
+#include <ebos/eclmpiserializer.hh>
+#endif
+#include <opm/input/eclipse/EclipseState/Util/OrderedMap.hpp>
+
+namespace Opm
+{
+namespace Mpi
+{
+template<class T>
+std::size_t packSize(const T*, std::size_t, Opm::Parallel::MPIComm,
+                     std::integral_constant<bool, false>)
+{
+    OPM_THROW(std::logic_error, "Packing not (yet) supported for this non-pod type.");
+}
+
+template<class T>
+std::size_t packSize(const T*, std::size_t l, Opm::Parallel::MPIComm comm,
+                     std::integral_constant<bool, true>)
+{
+#if HAVE_MPI
+    int size;
+    MPI_Pack_size(1, Dune::MPITraits<std::size_t>::getType(), comm, &size);
+    std::size_t totalSize = size;
+    MPI_Pack_size(l, Dune::MPITraits<T>::getType(), comm, &size);
+    return totalSize + size;
+#else
+    (void) comm;
+    return l-l;
+#endif
+}
+
+template<class T>
+std::size_t packSize(const T* data, std::size_t l, Opm::Parallel::MPIComm comm)
+{
+    return packSize(data, l, comm, typename std::is_pod<T>::type());
+}
+
+template<class T1, class T2>
+std::size_t packSize(const std::pair<T1,T2>& data, Opm::Parallel::MPIComm comm)
+{
+    return packSize(data.first, comm) + packSize(data.second, comm);
+}
+
+template<class T>
+std::size_t packSize(const std::optional<T>& data, Opm::Parallel::MPIComm comm)
+{
+    bool has_value = data.has_value();
+    std::size_t pack_size = packSize(has_value, comm);
+    if (has_value)
+        pack_size += packSize(*data, comm);
+    return pack_size;
+}
+
+
+template<class T, class A>
+std::size_t packSize(const std::vector<T,A>& data, Opm::Parallel::MPIComm comm)
+{
+    if (std::is_pod<T>::value)
+        // size written automatically
+        return packSize(data.data(), data.size(), comm);
+
+    std::size_t size = packSize(data.size(), comm);
+
+    for (const auto& entry: data)
+        size += packSize(entry, comm);
+
+    return size;
+}
+
+template<class A>
+std::size_t packSize(const std::vector<bool,A>& data, Opm::Parallel::MPIComm comm)
+{
+    bool entry = false;
+    return packSize(data.size(), comm) + data.size()*packSize(entry,comm);
+}
+
+template<std::size_t I = 0, typename Tuple>
+typename std::enable_if<I == std::tuple_size<Tuple>::value, std::size_t>::type
+pack_size_tuple_entry(const Tuple&, Opm::Parallel::MPIComm)
+{
+    return 0;
+}
+
+template<std::size_t I = 0, typename Tuple>
+typename std::enable_if<I != std::tuple_size<Tuple>::value, std::size_t>::type
+pack_size_tuple_entry(const Tuple& tuple, Opm::Parallel::MPIComm comm)
+{
+    return packSize(std::get<I>(tuple), comm) + pack_size_tuple_entry<I+1>(tuple, comm);
+}
+
+template<class... Ts>
+std::size_t packSize(const std::tuple<Ts...>& data, Opm::Parallel::MPIComm comm)
+{
+    return pack_size_tuple_entry(data, comm);
+}
+
+template<class T, class H, class KE, class A>
+std::size_t packSize(const std::unordered_set<T,H,KE,A>& data,
+                     Opm::Parallel::MPIComm comm)
+{
+    std::size_t totalSize = packSize(data.size(), comm);
+    for (const auto& entry : data)
+    {
+        totalSize += packSize(entry, comm);
+    }
+    return totalSize;
+}
+
+template<class K, class C, class A>
+std::size_t packSize(const std::set<K,C,A>& data,
+                     Opm::Parallel::MPIComm comm)
+{
+    std::size_t totalSize = packSize(data.size(), comm);
+    for (const auto& entry : data)
+    {
+        totalSize += packSize(entry, comm);
+    }
+    return totalSize;
+}
+
+std::size_t packSize(const char* str, Opm::Parallel::MPIComm comm)
+{
+#if HAVE_MPI
+    int size;
+    MPI_Pack_size(1, Dune::MPITraits<std::size_t>::getType(), comm, &size);
+    int totalSize = size;
+    MPI_Pack_size(strlen(str)+1, MPI_CHAR, comm, &size);
+    return totalSize + size;
+#else
+    (void) str;
+    (void) comm;
+    return 0;
+#endif
+}
+
+std::size_t packSize(const std::string& str, Opm::Parallel::MPIComm comm)
+{
+    return packSize(str.c_str(), comm);
+}
+
+template<class T1, class T2, class C, class A>
+std::size_t packSize(const std::map<T1,T2,C,A>& data, Opm::Parallel::MPIComm comm)
+{
+    std::size_t totalSize = packSize(data.size(), comm);
+    for (const auto& entry: data)
+    {
+        totalSize += packSize(entry, comm);
+    }
+    return totalSize;
+}
+
+template<class T1, class T2, class H, class P, class A>
+std::size_t packSize(const std::unordered_map<T1,T2,H,P,A>& data, Opm::Parallel::MPIComm comm)
+{
+    std::size_t totalSize = packSize(data.size(), comm);
+    for (const auto& entry: data)
+    {
+        totalSize += packSize(entry, comm);
+    }
+    return totalSize;
+}
+
+template<class T, std::size_t N>
+std::size_t packSize(const std::array<T,N>& data, Opm::Parallel::MPIComm comm)
+{
+    return N*packSize(data[0], comm);
+}
+
+template <class T>
+struct Packing
+{
+};
+
+template <std::size_t Size>
+struct Packing<std::bitset<Size>>
+{
+    static std::size_t packSize(const std::bitset<Size>& data, Opm::Parallel::MPIComm comm)
+    {
+        return Mpi::packSize(data.to_ullong(), comm);
+    }
+
+    static void pack(const std::bitset<Size>& data, std::vector<char>& buffer, int& position, Opm::Parallel::MPIComm comm)
+    {
+        Mpi::pack(data.to_ullong(), buffer, position, comm);
+    }
+
+    static void unpack(std::bitset<Size>& data, std::vector<char>& buffer, int& position, Opm::Parallel::MPIComm comm)
+    {
+        unsigned long long d;
+        Mpi::unpack(d, buffer, position, comm);
+        data = std::bitset<Size>(d);
+    }
+};
+
+template<std::size_t Size>
+std::size_t packSize(const std::bitset<Size>& data, Opm::Parallel::MPIComm comm)
+{
+    return Packing<std::bitset<Size>>::packSize(data, comm);
+}
+
+std::size_t packSize(const Opm::time_point&, Opm::Parallel::MPIComm comm)
+{
+    std::time_t tp = 0;
+    return packSize(tp, comm);
+}
+
+
+////// pack routines
+
+template<class T>
+void pack(const T*, std::size_t, std::vector<char>&, int&,
+          Opm::Parallel::MPIComm, std::integral_constant<bool, false>)
+{
+    OPM_THROW(std::logic_error, "Packing not (yet) supported for this non-pod type.");
+}
+
+template<class T>
+void pack(const T* data, std::size_t l, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm,
+          std::integral_constant<bool, true>)
+{
+#if HAVE_MPI
+    MPI_Pack(&l, 1, Dune::MPITraits<std::size_t>::getType(), buffer.data(),
+             buffer.size(), &position, comm);
+    MPI_Pack(data, l, Dune::MPITraits<T>::getType(), buffer.data(),
+             buffer.size(), &position, comm);
+#else
+    (void) data;
+    (void) comm;
+    (void) l;
+    (void) buffer;
+    (void) position;
+#endif
+}
+
+template<class T>
+void pack(const T* data, std::size_t l, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm)
+{
+    pack(data, l, buffer, position, comm, typename std::is_pod<T>::type());
+}
+
+template<class T1, class T2>
+void pack(const std::pair<T1,T2>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm)
+{
+    pack(data.first, buffer, position, comm);
+    pack(data.second, buffer, position, comm);
+}
+
+template<class T>
+void pack(const std::optional<T>& data, std::vector<char>& buffer, int& position,
+    Opm::Parallel::MPIComm comm)
+{
+    bool has_value = data.has_value();
+    pack(has_value, buffer, position, comm);
+    if (has_value)
+        pack(*data, buffer, position, comm);
+}
+
+
+template<class T, class A>
+void pack(const std::vector<T, A>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm)
+{
+    if (std::is_pod<T>::value)
+    {
+        // size written automatically
+        pack(data.data(), data.size(), buffer, position, comm);
+        return;
+    }
+
+    pack(data.size(), buffer, position, comm);
+
+    for (const auto& entry: data)
+        pack(entry, buffer, position, comm);
+}
+
+template<class K, class C, class A>
+void pack(const std::set<K,C,A>& data,
+          std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm)
+{
+    pack(data.size(), buffer, position, comm);
+
+    for (const auto& entry : data)
+    {
+        pack(entry, buffer, position, comm);
+    }
+}
+
+template<class T, class H, class KE, class A>
+void pack(const std::unordered_set<T,H,KE,A>& data,
+          std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm)
+{
+    pack(data.size(), buffer, position, comm);
+
+    for (const auto& entry : data)
+    {
+        pack(entry, buffer, position, comm);
+    }
+}
+
+template<class T, size_t N>
+void pack(const std::array<T,N>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm)
+{
+    for (const T& entry : data)
+        pack(entry, buffer, position, comm);
+}
+
+template<class A>
+void pack(const std::vector<bool,A>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm)
+{
+    pack(data.size(), buffer, position, comm);
+    for (const auto entry : data) { // Not a reference: vector<bool> range
+        bool b = entry;
+        pack(b, buffer, position, comm);
+    }
+}
+
+template<std::size_t I = 0, typename Tuple>
+typename std::enable_if<I == std::tuple_size<Tuple>::value, void>::type
+pack_tuple_entry(const Tuple&, std::vector<char>&, int&,
+                      Opm::Parallel::MPIComm)
+{
+}
+
+template<std::size_t I = 0, typename Tuple>
+typename std::enable_if<I != std::tuple_size<Tuple>::value, void>::type
+pack_tuple_entry(const Tuple& tuple, std::vector<char>& buffer,
+                 int& position, Opm::Parallel::MPIComm comm)
+{
+    pack(std::get<I>(tuple), buffer, position, comm);
+    pack_tuple_entry<I+1>(tuple, buffer, position, comm);
+}
+
+template<class... Ts>
+void pack(const std::tuple<Ts...>& data, std::vector<char>& buffer,
+          int& position, Opm::Parallel::MPIComm comm)
+{
+    pack_tuple_entry(data, buffer, position, comm);
+}
+
+void pack(const char* str, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm)
+{
+#if HAVE_MPI
+    std::size_t length = strlen(str)+1;
+    MPI_Pack(&length, 1, Dune::MPITraits<std::size_t>::getType(), buffer.data(),
+        buffer.size(), &position, comm);
+    MPI_Pack(str, strlen(str)+1, MPI_CHAR, buffer.data(), buffer.size(),
+         &position, comm);
+#else
+    (void) str;
+    (void) comm;
+    (void) buffer;
+    (void) position;
+#endif
+}
+
+void pack(const std::string& str, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm)
+{
+    pack(str.c_str(), buffer, position, comm);
+}
+
+template<class T1, class T2, class C, class A>
+void pack(const std::map<T1,T2,C,A>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm)
+{
+    pack(data.size(), buffer, position, comm);
+
+    for (const auto& entry: data)
+    {
+        pack(entry, buffer, position, comm);
+    }
+}
+
+template<class T1, class T2, class H, class P, class A>
+void pack(const std::unordered_map<T1,T2,H,P,A>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm)
+{
+    pack(data.size(), buffer, position, comm);
+
+    for (const auto& entry: data)
+    {
+        pack(entry, buffer, position, comm);
+    }
+}
+
+template<std::size_t Size>
+void pack(const std::bitset<Size>& data, std::vector<char>& buffer,
+          int& position, Opm::Parallel::MPIComm comm)
+{
+    Packing<std::bitset<Size>>::pack(data, buffer, position, comm);
+}
+
+void pack(const Opm::time_point& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm)
+{
+    pack(Opm::TimeService::to_time_t(data), buffer, position, comm);
+}
+
+
+/// Mpi::unpack routines
+
+template<class T>
+void unpack(T*, const std::size_t&, std::vector<char>&, int&,
+            Opm::Parallel::MPIComm, std::integral_constant<bool, false>)
+{
+    OPM_THROW(std::logic_error, "Packing not (yet) supported for this non-pod type.");
+}
+
+template<class T>
+void unpack(T* data, const std::size_t& l, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm,
+            std::integral_constant<bool, true>)
+{
+#if HAVE_MPI
+    MPI_Unpack(buffer.data(), buffer.size(), &position, data, l,
+               Dune::MPITraits<T>::getType(), comm);
+#else
+    (void) data;
+    (void) comm;
+    (void) l;
+    (void) buffer;
+    (void) position;
+#endif
+}
+
+template<class T>
+void unpack(T* data, const std::size_t& l, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm)
+{
+    unpack(data, l, buffer, position, comm, typename std::is_pod<T>::type());
+}
+
+template<class T1, class T2>
+void unpack(std::pair<T1,T2>& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm)
+{
+    unpack(data.first, buffer, position, comm);
+    unpack(data.second, buffer, position, comm);
+}
+
+template<class T>
+void unpack(std::optional<T>&data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm)
+{
+    bool has_value;
+    unpack(has_value, buffer, position, comm);
+    if (has_value) {
+        T val;
+        unpack(val, buffer, position, comm);
+        data = std::optional<T>(val);
+    } else
+        data.reset();
+}
+
+
+template<class T, class A>
+void unpack(std::vector<T,A>& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm)
+{
+    std::size_t length = 0;
+    unpack(length, buffer, position, comm);
+    data.resize(length);
+
+    if (std::is_pod<T>::value)
+    {
+        unpack(data.data(), data.size(), buffer, position, comm);
+        return;
+    }
+
+    for (auto& entry: data)
+        unpack(entry, buffer, position, comm);
+}
+
+template<class A>
+void unpack(std::vector<bool,A>& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm)
+{
+    size_t size;
+    unpack(size, buffer, position, comm);
+    data.clear();
+    data.reserve(size);
+    for (size_t i = 0; i < size; ++i) {
+        bool entry;
+        unpack(entry, buffer, position, comm);
+        data.push_back(entry);
+    }
+}
+
+template<std::size_t I = 0, typename Tuple>
+typename std::enable_if<I == std::tuple_size<Tuple>::value, void>::type
+unpack_tuple_entry(Tuple&, std::vector<char>&, int&,
+                   Opm::Parallel::MPIComm)
+{
+}
+
+template<std::size_t I = 0, typename Tuple>
+typename std::enable_if<I != std::tuple_size<Tuple>::value, void>::type
+unpack_tuple_entry(Tuple& tuple, std::vector<char>& buffer,
+                   int& position, Opm::Parallel::MPIComm comm)
+{
+    unpack(std::get<I>(tuple), buffer, position, comm);
+    unpack_tuple_entry<I+1>(tuple, buffer, position, comm);
+}
+
+template<class... Ts>
+void unpack(std::tuple<Ts...>& data, std::vector<char>& buffer,
+            int& position, Opm::Parallel::MPIComm comm)
+{
+    unpack_tuple_entry(data, buffer, position, comm);
+}
+
+template<class K, class C, class A>
+void unpack(std::set<K,C,A>& data,
+            std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm)
+{
+    std::size_t size = 0;
+    unpack(size, buffer, position, comm);
+
+    for (;size>0; size--)
+    {
+        K entry;
+        unpack(entry, buffer, position, comm);
+        data.insert(entry);
+    }
+}
+
+template<class T, class H, class KE, class A>
+void unpack(std::unordered_set<T,H,KE,A>& data,
+            std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm)
+{
+    std::size_t size=0;
+    unpack(size, buffer, position, comm);
+
+    for (;size>0; size--)
+    {
+        T entry;
+        unpack(entry, buffer, position, comm);
+        data.insert(entry);
+    }
+}
+
+template<class T, size_t N>
+void unpack(std::array<T,N>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm)
+{
+    for (T& entry : data)
+        unpack(entry, buffer, position, comm);
+}
+
+void unpack(char* str, std::size_t length, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm)
+{
+#if HAVE_MPI
+    MPI_Unpack(buffer.data(), buffer.size(), &position, const_cast<char*>(str), length, MPI_CHAR, comm);
+#else
+    (void) str;
+    (void) comm;
+    (void) length;
+    (void) buffer;
+    (void) position;
+#endif
+}
+
+void unpack(std::string& str, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm)
+{
+    std::size_t length=0;
+    unpack(length, buffer, position, comm);
+    std::vector<char> cStr(length, '\0');
+    unpack(cStr.data(), length, buffer, position, comm);
+    str.clear();
+    str.append(cStr.data());
+}
+
+template<class T1, class T2, class C, class A>
+void unpack(std::map<T1,T2,C,A>& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm)
+{
+    std::size_t size=0;
+    unpack(size, buffer, position, comm);
+
+    for (;size>0; size--)
+    {
+        std::pair<T1,T2> entry;
+        unpack(entry, buffer, position, comm);
+        data.insert(entry);
+    }
+}
+
+template<class T1, class T2, class H, class P, class A>
+void unpack(std::unordered_map<T1,T2,H,P,A>& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm)
+{
+    std::size_t size=0;
+    unpack(size, buffer, position, comm);
+
+    for (;size>0; size--)
+    {
+        std::pair<T1,T2> entry;
+        unpack(entry, buffer, position, comm);
+        data.insert(entry);
+    }
+}
+
+template<std::size_t Size>
+void unpack(std::bitset<Size>& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm)
+{
+    Packing<std::bitset<Size>>::unpack(data, buffer, position, comm);
+}
+
+void unpack([[maybe_unused]] Opm::time_point& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm)
+{
+    std::time_t tp;
+    unpack(tp, buffer, position, comm);
+#if HAVE_MPI
+    data = Opm::TimeService::from_time_t(tp);
+#endif
+}
+
+
+#define INSTANTIATE_PACK_VECTOR(...) \
+template std::size_t packSize(const std::vector<__VA_ARGS__>& data, \
+                              Opm::Parallel::MPIComm comm); \
+template void pack(const std::vector<__VA_ARGS__>& data, \
+                   std::vector<char>& buffer, int& position, \
+                   Opm::Parallel::MPIComm comm); \
+template void unpack(std::vector<__VA_ARGS__>& data, \
+                     std::vector<char>& buffer, int& position, \
+                     Opm::Parallel::MPIComm comm);
+
+INSTANTIATE_PACK_VECTOR(float)
+INSTANTIATE_PACK_VECTOR(double)
+INSTANTIATE_PACK_VECTOR(std::vector<double>)
+INSTANTIATE_PACK_VECTOR(bool)
+INSTANTIATE_PACK_VECTOR(char)
+INSTANTIATE_PACK_VECTOR(int)
+INSTANTIATE_PACK_VECTOR(unsigned char)
+INSTANTIATE_PACK_VECTOR(unsigned int)
+INSTANTIATE_PACK_VECTOR(unsigned long int)
+INSTANTIATE_PACK_VECTOR(unsigned long long int)
+INSTANTIATE_PACK_VECTOR(std::time_t)
+INSTANTIATE_PACK_VECTOR(std::array<double, 3>)
+INSTANTIATE_PACK_VECTOR(std::pair<bool,double>)
+INSTANTIATE_PACK_VECTOR(std::map<std::string,int>)
+INSTANTIATE_PACK_VECTOR(std::pair<std::string,std::vector<size_t>>)
+INSTANTIATE_PACK_VECTOR(std::pair<int,std::vector<int>>)
+INSTANTIATE_PACK_VECTOR(std::pair<int,std::vector<size_t>>)
+INSTANTIATE_PACK_VECTOR(std::string)
+
+#undef INSTANTIATE_PACK_VECTOR
+
+#undef INSTANTIATE_PACK_SET
+
+#define INSTANTIATE_PACK(...) \
+template std::size_t packSize(const __VA_ARGS__& data, \
+                              Opm::Parallel::MPIComm comm); \
+template void pack(const __VA_ARGS__& data, \
+                   std::vector<char>& buffer, int& position, \
+                   Opm::Parallel::MPIComm comm); \
+template void unpack(__VA_ARGS__& data, \
+                     std::vector<char>& buffer, int& position, \
+                     Opm::Parallel::MPIComm comm);
+
+INSTANTIATE_PACK(float)
+INSTANTIATE_PACK(double)
+INSTANTIATE_PACK(bool)
+INSTANTIATE_PACK(int)
+INSTANTIATE_PACK(unsigned char)
+INSTANTIATE_PACK(unsigned int)
+INSTANTIATE_PACK(unsigned long int)
+INSTANTIATE_PACK(unsigned long long int)
+INSTANTIATE_PACK(std::array<short,3>)
+INSTANTIATE_PACK(std::array<bool,3>)
+INSTANTIATE_PACK(std::array<int,3>)
+INSTANTIATE_PACK(std::array<double,4>)
+INSTANTIATE_PACK(std::array<double,5>)
+INSTANTIATE_PACK(std::map<std::pair<int,int>,std::pair<bool,double>>)
+INSTANTIATE_PACK(std::optional<double>)
+INSTANTIATE_PACK(std::optional<std::string>)
+INSTANTIATE_PACK(std::pair<double, double>)
+INSTANTIATE_PACK(std::optional<std::pair<double,double>>)
+INSTANTIATE_PACK(std::map<std::string,std::vector<int>>)
+INSTANTIATE_PACK(std::map<std::string,std::map<std::pair<int,int>,int>>)
+INSTANTIATE_PACK(std::map<std::string,int>)
+INSTANTIATE_PACK(std::map<std::string,double>)
+INSTANTIATE_PACK(std::map<int,int>)
+INSTANTIATE_PACK(std::unordered_map<std::string,size_t>)
+INSTANTIATE_PACK(std::unordered_map<std::string,size_t,Opm::OrderedMapDetail::TruncatedStringHash<std::string::npos>, Opm::OrderedMapDetail::TruncatedStringEquals<std::string::npos>>)
+INSTANTIATE_PACK(std::unordered_map<std::string,size_t,Opm::OrderedMapDetail::TruncatedStringHash<8>, Opm::OrderedMapDetail::TruncatedStringEquals<8>>)
+INSTANTIATE_PACK(std::unordered_map<std::string,std::string>)
+INSTANTIATE_PACK(std::unordered_set<std::string>)
+INSTANTIATE_PACK(std::set<std::string>)
+INSTANTIATE_PACK(std::bitset<4>)
+
+
+#undef INSTANTIATE_PACK
+
+} // end namespace Mpi
+
+} // end namespace Opm
diff --git a/opm/simulators/utils/MPIPacker.hpp b/opm/simulators/utils/MPIPacker.hpp
new file mode 100644
index 000000000..ac837487c
--- /dev/null
+++ b/opm/simulators/utils/MPIPacker.hpp
@@ -0,0 +1,373 @@
+/*
+  Copyright 2019 Equinor AS.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef MPI_SERIALIZER_HPP
+#define MPI_SERIALIZER_HPP
+
+#include <opm/common/ErrorMacros.hpp>
+#include <opm/common/utility/TimeService.hpp>
+
+#include <opm/simulators/utils/ParallelCommunication.hpp>
+
+#include <bitset>
+#include <cstddef>
+#include <optional>
+#include <map>
+#include <set>
+#include <string>
+#include <tuple>
+#include <typeinfo>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+namespace Opm
+{
+
+namespace Mpi
+{
+template<class T>
+std::size_t packSize(const T*, std::size_t, Opm::Parallel::MPIComm,
+                     std::integral_constant<bool, false>);
+
+template<class T>
+std::size_t packSize(const T*, std::size_t l, Opm::Parallel::MPIComm comm,
+                     std::integral_constant<bool, true>);
+
+template<class T>
+std::size_t packSize(const T* data, std::size_t l, Opm::Parallel::MPIComm comm);
+
+template<class T>
+std::size_t packSize(const T&, Opm::Parallel::MPIComm,
+                     std::integral_constant<bool, false>)
+{
+    std::string msg = std::string{"Packing not (yet) supported for non-pod type: "} + typeid(T).name();
+    OPM_THROW(std::logic_error, msg);
+}
+
+template<class T>
+std::size_t packSize(const T&, Opm::Parallel::MPIComm comm,
+                     std::integral_constant<bool, true>)
+{
+#if HAVE_MPI
+    int size{};
+    MPI_Pack_size(1, Dune::MPITraits<T>::getType(), comm, &size);
+    return size;
+#else
+    (void) comm;
+    return 0;
+#endif
+}
+
+template<class T>
+std::size_t packSize(const T& data, Opm::Parallel::MPIComm comm)
+{
+    return packSize(data, comm, typename std::is_pod<T>::type());
+}
+
+template<class T1, class T2>
+std::size_t packSize(const std::pair<T1,T2>& data, Opm::Parallel::MPIComm comm);
+
+template<class T>
+std::size_t packSize(const std::optional<T>& data, Opm::Parallel::MPIComm comm);
+
+template<class T, class A>
+std::size_t packSize(const std::vector<T,A>& data, Opm::Parallel::MPIComm comm);
+
+template<class K, class C, class A>
+std::size_t packSize(const std::set<K,C,A>& data,
+                     Opm::Parallel::MPIComm comm);
+
+template<class T, class H, class KE, class A>
+std::size_t packSize(const std::unordered_set<T,H,KE,A>& data,
+                     Opm::Parallel::MPIComm comm);
+
+template<class A>
+std::size_t packSize(const std::vector<bool,A>& data, Opm::Parallel::MPIComm comm);
+
+template<class... Ts>
+std::size_t packSize(const std::tuple<Ts...>& data, Opm::Parallel::MPIComm comm);
+
+template<class T, std::size_t N>
+std::size_t packSize(const std::array<T,N>& data, Opm::Parallel::MPIComm comm);
+
+std::size_t packSize(const char* str, Opm::Parallel::MPIComm comm);
+
+template<class T1, class T2, class C, class A>
+std::size_t packSize(const std::map<T1,T2,C,A>& data, Opm::Parallel::MPIComm comm);
+
+template<class T1, class T2, class H, class P, class A>
+std::size_t packSize(const std::unordered_map<T1,T2,H,P,A>& data, Opm::Parallel::MPIComm comm);
+
+template<std::size_t Size>
+std::size_t packSize(const std::bitset<Size>& data, Opm::Parallel::MPIComm comm);
+
+////// pack routines
+
+template<class T>
+void pack(const T*, std::size_t, std::vector<char>&, int&,
+          Opm::Parallel::MPIComm, std::integral_constant<bool, false>);
+
+template<class T>
+void pack(const T* data, std::size_t l, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm, std::integral_constant<bool, true>);
+
+template<class T>
+void pack(const T* data, std::size_t l, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm);
+
+template<class T>
+void pack(const T&, std::vector<char>&, int&,
+          Opm::Parallel::MPIComm, std::integral_constant<bool, false>)
+{
+    OPM_THROW(std::logic_error, "Packing not (yet) supported for this non-pod type.");
+}
+
+template<class T>
+void pack(const T& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm, std::integral_constant<bool, true>)
+{
+#if HAVE_MPI
+    MPI_Pack(&data, 1, Dune::MPITraits<T>::getType(), buffer.data(),
+             buffer.size(), &position, comm);
+#else
+    (void) data;
+    (void) comm;
+    (void) buffer;
+    (void) position;
+#endif
+}
+
+template<class T>
+void pack(const T& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm)
+{
+    pack(data, buffer, position, comm, typename std::is_pod<T>::type());
+}
+
+template<class T1, class T2>
+void pack(const std::pair<T1,T2>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm);
+
+template<class T>
+void pack(const std::optional<T>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm);
+
+template<class T, class A>
+void pack(const std::vector<T,A>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm);
+
+template<class A>
+void pack(const std::vector<bool,A>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm);
+
+template<class... Ts>
+void pack(const std::tuple<Ts...>& data, std::vector<char>& buffer,
+          int& position, Opm::Parallel::MPIComm comm);
+
+template<class K, class C, class A>
+void pack(const std::set<K,C,A>& data,
+          std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm);
+
+template<class T, class H, class KE, class A>
+void pack(const std::unordered_set<T,H,KE,A>& data,
+          std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm);
+
+template<class T, size_t N>
+void pack(const std::array<T,N>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm);
+
+template<class T1, class T2, class C, class A>
+void pack(const std::map<T1,T2,C,A>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm);
+
+template<class T1, class T2, class H, class P, class A>
+void pack(const std::unordered_map<T1,T2,H,P,A>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm);
+
+void pack(const char* str, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm);
+
+template<std::size_t Size>
+void pack(const std::bitset<Size>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm);
+
+/// unpack routines
+
+template<class T>
+void unpack(T*, const std::size_t&, std::vector<char>&, int&,
+            Opm::Parallel::MPIComm, std::integral_constant<bool, false>);
+
+template<class T>
+void unpack(T* data, const std::size_t& l, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm,
+            std::integral_constant<bool, true>);
+
+template<class T>
+void unpack(T* data, const std::size_t& l, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm);
+
+template<class T>
+void unpack(T&, std::vector<char>&, int&,
+            Opm::Parallel::MPIComm, std::integral_constant<bool, false>)
+{
+    OPM_THROW(std::logic_error, "Packing not (yet) supported for this non-pod type.");
+}
+
+template<class T>
+void unpack(T& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm, std::integral_constant<bool, true>)
+{
+#if HAVE_MPI
+    MPI_Unpack(buffer.data(), buffer.size(), &position, &data, 1,
+               Dune::MPITraits<T>::getType(), comm);
+#else
+    (void) data;
+    (void) comm;
+    (void) buffer;
+    (void) position;
+#endif
+}
+
+template<class T>
+void unpack(T& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm)
+{
+    unpack(data, buffer, position, comm, typename std::is_pod<T>::type());
+}
+
+template<class T1, class T2>
+void unpack(std::pair<T1,T2>& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm);
+
+template<class T>
+void unpack(std::optional<T>& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm);
+
+template<class T, class A>
+void unpack(std::vector<T,A>& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm);
+
+template<class A>
+void unpack(std::vector<bool,A>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm);
+
+template<class... Ts>
+void unpack(std::tuple<Ts...>& data, std::vector<char>& buffer,
+            int& position, Opm::Parallel::MPIComm comm);
+
+template<class K, class C, class A>
+void unpack(std::set<K,C,A>& data,
+            std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm);
+
+template<class T, class H, class KE, class A>
+void unpack(std::unordered_set<T,H,KE,A>& data,
+            std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm);
+
+template<class T, size_t N>
+void unpack(std::array<T,N>& data, std::vector<char>& buffer, int& position,
+          Opm::Parallel::MPIComm comm);
+
+template<class T1, class T2, class C, class A>
+void unpack(std::map<T1,T2,C,A>& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm);
+
+template<class T1, class T2, class H, class P, class A>
+void unpack(std::unordered_map<T1,T2,H,P,A>& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm);
+
+void unpack(char* str, std::size_t length, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm);
+
+template<std::size_t Size>
+void unpack(std::bitset<Size>& data, std::vector<char>& buffer, int& position,
+            Opm::Parallel::MPIComm comm);
+
+/// prototypes for complex types
+
+#define ADD_PACK_PROTOTYPES(T) \
+  std::size_t packSize(const T& data, Opm::Parallel::MPIComm comm); \
+  void pack(const T& data, std::vector<char>& buffer, int& position, \
+          Opm::Parallel::MPIComm comm); \
+  void unpack(T& data, std::vector<char>& buffer, int& position, \
+              Opm::Parallel::MPIComm comm);
+
+ADD_PACK_PROTOTYPES(std::string)
+ADD_PACK_PROTOTYPES(time_point)
+
+template<typename T, typename... Args>
+void variadic_packsize(size_t& size, Parallel::Communication comm, T& first, Args&&... args)
+{
+  size += packSize(first, comm);
+  if constexpr (sizeof...(args) > 0)
+      variadic_packsize(size, comm, std::forward<Args>(args)...);
+}
+
+template<typename T, typename... Args>
+void variadic_pack(int& pos, std::vector<char>& buffer, Parallel::Communication comm, T& first, Args&&... args)
+{
+  pack(first, buffer, pos, comm);
+  if constexpr (sizeof...(args) > 0)
+      variadic_pack(pos, buffer, comm, std::forward<Args>(args)...);
+}
+
+template<typename T, typename... Args>
+void variadic_unpack(int& pos, std::vector<char>& buffer, Parallel::Communication comm, T& first, Args&&... args)
+{
+  unpack(first, buffer, pos, comm);
+  if constexpr (sizeof...(args) > 0)
+      variadic_unpack(pos, buffer, comm, std::forward<Args>(args)...);
+}
+
+#if HAVE_MPI
+template<typename... Args>
+void broadcast(Parallel::Communication comm, int root, Args&&... args)
+{
+  if (comm.size() == 1)
+      return;
+
+  size_t size = 0;
+  if (comm.rank() == root)
+      variadic_packsize(size, comm, args...);
+
+  comm.broadcast(&size, 1, root);
+  std::vector<char> buffer(size);
+  if (comm.rank() == root) {
+      int pos = 0;
+      variadic_pack(pos, buffer, comm, args...);
+  }
+  comm.broadcast(buffer.data(), size, root);
+  if (comm.rank() != root) {
+      int pos = 0;
+      variadic_unpack(pos, buffer, comm, std::forward<Args>(args)...);
+  }
+}
+#else
+template<typename... Args>
+void broadcast(Parallel::Communication, int, Args&&...)
+{}
+#endif
+
+} // end namespace Mpi
+
+} // end namespace Opm
+#endif // MPI_SERIALIZER_HPP
diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp
index ad82b6c70..bc83c7015 100644
--- a/opm/simulators/utils/ParallelRestart.cpp
+++ b/opm/simulators/utils/ParallelRestart.cpp
@@ -17,21 +17,16 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <config.h>
+#include "ParallelRestart.hpp"
+
 #if HAVE_MPI
 #include <mpi.h>
 #endif
 
-#include "ParallelRestart.hpp"
-#include <cassert>
-#include <cstdint>
-#include <cstring>
-#include <ctime>
-#include <memory>
-
-#include <dune/common/parallel/mpitraits.hh>
 #if HAVE_MPI
 #include <ebos/eclmpiserializer.hh>
 #endif
+
 #include <opm/output/eclipse/EclipseIO.hpp>
 #include <opm/input/eclipse/EclipseState/Util/OrderedMap.hpp>
 #include <opm/output/eclipse/RestartValue.hpp>
@@ -39,713 +34,10 @@
 
 namespace Opm
 {
-namespace Mpi
-{
-template<class T>
-std::size_t packSize(const T*, std::size_t, Opm::Parallel::MPIComm,
-                     std::integral_constant<bool, false>)
-{
-    OPM_THROW(std::logic_error, "Packing not (yet) supported for this non-pod type.");
-}
 
-template<class T>
-std::size_t packSize(const T*, std::size_t l, Opm::Parallel::MPIComm comm,
-                     std::integral_constant<bool, true>)
-{
-#if HAVE_MPI
-    int size;
-    MPI_Pack_size(1, Dune::MPITraits<std::size_t>::getType(), comm, &size);
-    std::size_t totalSize = size;
-    MPI_Pack_size(l, Dune::MPITraits<T>::getType(), comm, &size);
-    return totalSize + size;
-#else
-    (void) comm;
-    return l-l;
-#endif
-}
-
-template<class T>
-std::size_t packSize(const T* data, std::size_t l, Opm::Parallel::MPIComm comm)
-{
-    return packSize(data, l, comm, typename std::is_pod<T>::type());
-}
-
-template<class T1, class T2>
-std::size_t packSize(const std::pair<T1,T2>& data, Opm::Parallel::MPIComm comm)
-{
-    return packSize(data.first, comm) + packSize(data.second, comm);
-}
-
-template<class T>
-std::size_t packSize(const std::optional<T>& data, Opm::Parallel::MPIComm comm)
-{
-    bool has_value = data.has_value();
-    std::size_t pack_size = packSize(has_value, comm);
-    if (has_value)
-        pack_size += packSize(*data, comm);
-    return pack_size;
-}
-
-
-template<class T, class A>
-std::size_t packSize(const std::vector<T,A>& data, Opm::Parallel::MPIComm comm)
-{
-    if (std::is_pod<T>::value)
-        // size written automatically
-        return packSize(data.data(), data.size(), comm);
-
-    std::size_t size = packSize(data.size(), comm);
-
-    for (const auto& entry: data)
-        size += packSize(entry, comm);
-
-    return size;
-}
-
-template<class A>
-std::size_t packSize(const std::vector<bool,A>& data, Opm::Parallel::MPIComm comm)
-{
-    bool entry = false;
-    return packSize(data.size(), comm) + data.size()*packSize(entry,comm);
-}
-
-template<std::size_t I = 0, typename Tuple>
-typename std::enable_if<I == std::tuple_size<Tuple>::value, std::size_t>::type
-pack_size_tuple_entry(const Tuple&, Opm::Parallel::MPIComm)
-{
-    return 0;
-}
-
-template<std::size_t I = 0, typename Tuple>
-typename std::enable_if<I != std::tuple_size<Tuple>::value, std::size_t>::type
-pack_size_tuple_entry(const Tuple& tuple, Opm::Parallel::MPIComm comm)
-{
-    return packSize(std::get<I>(tuple), comm) + pack_size_tuple_entry<I+1>(tuple, comm);
-}
-
-template<class... Ts>
-std::size_t packSize(const std::tuple<Ts...>& data, Opm::Parallel::MPIComm comm)
-{
-    return pack_size_tuple_entry(data, comm);
-}
-
-template<class T, class H, class KE, class A>
-std::size_t packSize(const std::unordered_set<T,H,KE,A>& data,
-                     Opm::Parallel::MPIComm comm)
-{
-    std::size_t totalSize = packSize(data.size(), comm);
-    for (const auto& entry : data)
-    {
-        totalSize += packSize(entry, comm);
-    }
-    return totalSize;
-}
-
-template<class K, class C, class A>
-std::size_t packSize(const std::set<K,C,A>& data,
-                     Opm::Parallel::MPIComm comm)
-{
-    std::size_t totalSize = packSize(data.size(), comm);
-    for (const auto& entry : data)
-    {
-        totalSize += packSize(entry, comm);
-    }
-    return totalSize;
-}
-
-std::size_t packSize(const char* str, Opm::Parallel::MPIComm comm)
-{
-#if HAVE_MPI
-    int size;
-    MPI_Pack_size(1, Dune::MPITraits<std::size_t>::getType(), comm, &size);
-    int totalSize = size;
-    MPI_Pack_size(strlen(str)+1, MPI_CHAR, comm, &size);
-    return totalSize + size;
-#else
-    (void) str;
-    (void) comm;
-    return 0;
-#endif
-}
-
-std::size_t packSize(const std::string& str, Opm::Parallel::MPIComm comm)
-{
-    return packSize(str.c_str(), comm);
-}
-
-template<class T1, class T2, class C, class A>
-std::size_t packSize(const std::map<T1,T2,C,A>& data, Opm::Parallel::MPIComm comm)
-{
-    std::size_t totalSize = packSize(data.size(), comm);
-    for (const auto& entry: data)
-    {
-        totalSize += packSize(entry, comm);
-    }
-    return totalSize;
-}
-
-template<class T1, class T2, class H, class P, class A>
-std::size_t packSize(const std::unordered_map<T1,T2,H,P,A>& data, Opm::Parallel::MPIComm comm)
-{
-    std::size_t totalSize = packSize(data.size(), comm);
-    for (const auto& entry: data)
-    {
-        totalSize += packSize(entry, comm);
-    }
-    return totalSize;
-}
-
-template<class T, std::size_t N>
-std::size_t packSize(const std::array<T,N>& data, Opm::Parallel::MPIComm comm)
-{
-    return N*packSize(data[0], comm);
-}
-
-template <class T>
-struct Packing
-{
-};
-
-template <std::size_t Size>
-struct Packing<std::bitset<Size>>
-{
-    static std::size_t packSize(const std::bitset<Size>& data, Opm::Parallel::MPIComm comm)
-    {
-        return Mpi::packSize(data.to_ullong(), comm);
-    }
-
-    static void pack(const std::bitset<Size>& data, std::vector<char>& buffer, int& position, Opm::Parallel::MPIComm comm)
-    {
-        Mpi::pack(data.to_ullong(), buffer, position, comm);
-    }
-
-    static void unpack(std::bitset<Size>& data, std::vector<char>& buffer, int& position, Opm::Parallel::MPIComm comm)
-    {
-        unsigned long long d;
-        Mpi::unpack(d, buffer, position, comm);
-        data = std::bitset<Size>(d);
-    }
-};
-
-template<std::size_t Size>
-std::size_t packSize(const std::bitset<Size>& data, Opm::Parallel::MPIComm comm)
-{
-    return Packing<std::bitset<Size>>::packSize(data, comm);
-}
-
-std::size_t packSize(const Opm::time_point&, Opm::Parallel::MPIComm comm)
-{
-    std::time_t tp = 0;
-    return packSize(tp, comm);
-}
-
-
-////// pack routines
-
-template<class T>
-void pack(const T*, std::size_t, std::vector<char>&, int&,
-          Opm::Parallel::MPIComm, std::integral_constant<bool, false>)
-{
-    OPM_THROW(std::logic_error, "Packing not (yet) supported for this non-pod type.");
-}
-
-template<class T>
-void pack(const T* data, std::size_t l, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm,
-          std::integral_constant<bool, true>)
-{
-#if HAVE_MPI
-    MPI_Pack(&l, 1, Dune::MPITraits<std::size_t>::getType(), buffer.data(),
-             buffer.size(), &position, comm);
-    MPI_Pack(data, l, Dune::MPITraits<T>::getType(), buffer.data(),
-             buffer.size(), &position, comm);
-#else
-    (void) data;
-    (void) comm;
-    (void) l;
-    (void) buffer;
-    (void) position;
-#endif
-}
-
-template<class T>
-void pack(const T* data, std::size_t l, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm)
-{
-    pack(data, l, buffer, position, comm, typename std::is_pod<T>::type());
-}
-
-template<class T1, class T2>
-void pack(const std::pair<T1,T2>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm)
-{
-    pack(data.first, buffer, position, comm);
-    pack(data.second, buffer, position, comm);
-}
-
-template<class T>
-void pack(const std::optional<T>& data, std::vector<char>& buffer, int& position,
-    Opm::Parallel::MPIComm comm)
-{
-    bool has_value = data.has_value();
-    pack(has_value, buffer, position, comm);
-    if (has_value)
-        pack(*data, buffer, position, comm);
-}
-
-
-template<class T, class A>
-void pack(const std::vector<T, A>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm)
-{
-    if (std::is_pod<T>::value)
-    {
-        // size written automatically
-        pack(data.data(), data.size(), buffer, position, comm);
-        return;
-    }
-
-    pack(data.size(), buffer, position, comm);
-
-    for (const auto& entry: data)
-        pack(entry, buffer, position, comm);
-}
-
-template<class K, class C, class A>
-void pack(const std::set<K,C,A>& data,
-          std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm)
-{
-    pack(data.size(), buffer, position, comm);
-
-    for (const auto& entry : data)
-    {
-        pack(entry, buffer, position, comm);
-    }
-}
-
-template<class T, class H, class KE, class A>
-void pack(const std::unordered_set<T,H,KE,A>& data,
-          std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm)
-{
-    pack(data.size(), buffer, position, comm);
-
-    for (const auto& entry : data)
-    {
-        pack(entry, buffer, position, comm);
-    }
-}
-
-template<class T, size_t N>
-void pack(const std::array<T,N>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm)
-{
-    for (const T& entry : data)
-        pack(entry, buffer, position, comm);
-}
-
-template<class A>
-void pack(const std::vector<bool,A>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm)
-{
-    pack(data.size(), buffer, position, comm);
-    for (const auto entry : data) { // Not a reference: vector<bool> range
-        bool b = entry;
-        pack(b, buffer, position, comm);
-    }
-}
-
-template<std::size_t I = 0, typename Tuple>
-typename std::enable_if<I == std::tuple_size<Tuple>::value, void>::type
-pack_tuple_entry(const Tuple&, std::vector<char>&, int&,
-                      Opm::Parallel::MPIComm)
-{
-}
-
-template<std::size_t I = 0, typename Tuple>
-typename std::enable_if<I != std::tuple_size<Tuple>::value, void>::type
-pack_tuple_entry(const Tuple& tuple, std::vector<char>& buffer,
-                 int& position, Opm::Parallel::MPIComm comm)
-{
-    pack(std::get<I>(tuple), buffer, position, comm);
-    pack_tuple_entry<I+1>(tuple, buffer, position, comm);
-}
-
-template<class... Ts>
-void pack(const std::tuple<Ts...>& data, std::vector<char>& buffer,
-          int& position, Opm::Parallel::MPIComm comm)
-{
-    pack_tuple_entry(data, buffer, position, comm);
-}
-
-void pack(const char* str, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm)
-{
-#if HAVE_MPI
-    std::size_t length = strlen(str)+1;
-    MPI_Pack(&length, 1, Dune::MPITraits<std::size_t>::getType(), buffer.data(),
-        buffer.size(), &position, comm);
-    MPI_Pack(str, strlen(str)+1, MPI_CHAR, buffer.data(), buffer.size(),
-         &position, comm);
-#else
-    (void) str;
-    (void) comm;
-    (void) buffer;
-    (void) position;
-#endif
-}
-
-void pack(const std::string& str, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm)
-{
-    pack(str.c_str(), buffer, position, comm);
-}
-
-template<class T1, class T2, class C, class A>
-void pack(const std::map<T1,T2,C,A>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm)
-{
-    pack(data.size(), buffer, position, comm);
-
-    for (const auto& entry: data)
-    {
-        pack(entry, buffer, position, comm);
-    }
-}
-
-template<class T1, class T2, class H, class P, class A>
-void pack(const std::unordered_map<T1,T2,H,P,A>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm)
-{
-    pack(data.size(), buffer, position, comm);
-
-    for (const auto& entry: data)
-    {
-        pack(entry, buffer, position, comm);
-    }
-}
-
-template<std::size_t Size>
-void pack(const std::bitset<Size>& data, std::vector<char>& buffer,
-          int& position, Opm::Parallel::MPIComm comm)
-{
-    Packing<std::bitset<Size>>::pack(data, buffer, position, comm);
-}
-
-void pack(const Opm::time_point& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm)
-{
-    pack(Opm::TimeService::to_time_t(data), buffer, position, comm);
-}
-
-
-/// Mpi::unpack routines
-
-template<class T>
-void unpack(T*, const std::size_t&, std::vector<char>&, int&,
-            Opm::Parallel::MPIComm, std::integral_constant<bool, false>)
-{
-    OPM_THROW(std::logic_error, "Packing not (yet) supported for this non-pod type.");
-}
-
-template<class T>
-void unpack(T* data, const std::size_t& l, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm,
-            std::integral_constant<bool, true>)
-{
-#if HAVE_MPI
-    MPI_Unpack(buffer.data(), buffer.size(), &position, data, l,
-               Dune::MPITraits<T>::getType(), comm);
-#else
-    (void) data;
-    (void) comm;
-    (void) l;
-    (void) buffer;
-    (void) position;
-#endif
-}
-
-template<class T>
-void unpack(T* data, const std::size_t& l, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm)
-{
-    unpack(data, l, buffer, position, comm, typename std::is_pod<T>::type());
-}
-
-template<class T1, class T2>
-void unpack(std::pair<T1,T2>& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm)
-{
-    unpack(data.first, buffer, position, comm);
-    unpack(data.second, buffer, position, comm);
-}
-
-template<class T>
-void unpack(std::optional<T>&data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm)
-{
-    bool has_value;
-    unpack(has_value, buffer, position, comm);
-    if (has_value) {
-        T val;
-        unpack(val, buffer, position, comm);
-        data = std::optional<T>(val);
-    } else
-        data.reset();
-}
-
-
-template<class T, class A>
-void unpack(std::vector<T,A>& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm)
-{
-    std::size_t length = 0;
-    unpack(length, buffer, position, comm);
-    data.resize(length);
-
-    if (std::is_pod<T>::value)
-    {
-        unpack(data.data(), data.size(), buffer, position, comm);
-        return;
-    }
-
-    for (auto& entry: data)
-        unpack(entry, buffer, position, comm);
-}
-
-template<class A>
-void unpack(std::vector<bool,A>& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm)
-{
-    size_t size;
-    unpack(size, buffer, position, comm);
-    data.clear();
-    data.reserve(size);
-    for (size_t i = 0; i < size; ++i) {
-        bool entry;
-        unpack(entry, buffer, position, comm);
-        data.push_back(entry);
-    }
-}
-
-template<std::size_t I = 0, typename Tuple>
-typename std::enable_if<I == std::tuple_size<Tuple>::value, void>::type
-unpack_tuple_entry(Tuple&, std::vector<char>&, int&,
-                   Opm::Parallel::MPIComm)
-{
-}
-
-template<std::size_t I = 0, typename Tuple>
-typename std::enable_if<I != std::tuple_size<Tuple>::value, void>::type
-unpack_tuple_entry(Tuple& tuple, std::vector<char>& buffer,
-                   int& position, Opm::Parallel::MPIComm comm)
-{
-    unpack(std::get<I>(tuple), buffer, position, comm);
-    unpack_tuple_entry<I+1>(tuple, buffer, position, comm);
-}
-
-template<class... Ts>
-void unpack(std::tuple<Ts...>& data, std::vector<char>& buffer,
-            int& position, Opm::Parallel::MPIComm comm)
-{
-    unpack_tuple_entry(data, buffer, position, comm);
-}
-
-template<class K, class C, class A>
-void unpack(std::set<K,C,A>& data,
-            std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm)
-{
-    std::size_t size = 0;
-    unpack(size, buffer, position, comm);
-
-    for (;size>0; size--)
-    {
-        K entry;
-        unpack(entry, buffer, position, comm);
-        data.insert(entry);
-    }
-}
-
-template<class T, class H, class KE, class A>
-void unpack(std::unordered_set<T,H,KE,A>& data,
-            std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm)
-{
-    std::size_t size=0;
-    unpack(size, buffer, position, comm);
-
-    for (;size>0; size--)
-    {
-        T entry;
-        unpack(entry, buffer, position, comm);
-        data.insert(entry);
-    }
-}
-
-template<class T, size_t N>
-void unpack(std::array<T,N>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm)
-{
-    for (T& entry : data)
-        unpack(entry, buffer, position, comm);
-}
-
-void unpack(char* str, std::size_t length, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm)
-{
-#if HAVE_MPI
-    MPI_Unpack(buffer.data(), buffer.size(), &position, const_cast<char*>(str), length, MPI_CHAR, comm);
-#else
-    (void) str;
-    (void) comm;
-    (void) length;
-    (void) buffer;
-    (void) position;
-#endif
-}
-
-void unpack(std::string& str, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm)
-{
-    std::size_t length=0;
-    unpack(length, buffer, position, comm);
-    std::vector<char> cStr(length, '\0');
-    unpack(cStr.data(), length, buffer, position, comm);
-    str.clear();
-    str.append(cStr.data());
-}
-
-template<class T1, class T2, class C, class A>
-void unpack(std::map<T1,T2,C,A>& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm)
-{
-    std::size_t size=0;
-    unpack(size, buffer, position, comm);
-
-    for (;size>0; size--)
-    {
-        std::pair<T1,T2> entry;
-        unpack(entry, buffer, position, comm);
-        data.insert(entry);
-    }
-}
-
-template<class T1, class T2, class H, class P, class A>
-void unpack(std::unordered_map<T1,T2,H,P,A>& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm)
-{
-    std::size_t size=0;
-    unpack(size, buffer, position, comm);
-
-    for (;size>0; size--)
-    {
-        std::pair<T1,T2> entry;
-        unpack(entry, buffer, position, comm);
-        data.insert(entry);
-    }
-}
-
-template<std::size_t Size>
-void unpack(std::bitset<Size>& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm)
-{
-    Packing<std::bitset<Size>>::unpack(data, buffer, position, comm);
-}
-
-void unpack([[maybe_unused]] Opm::time_point& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm)
-{
-    std::time_t tp;
-    unpack(tp, buffer, position, comm);
-#if HAVE_MPI
-    data = Opm::TimeService::from_time_t(tp);
-#endif
-}
-
-
-#define INSTANTIATE_PACK_VECTOR(...) \
-template std::size_t packSize(const std::vector<__VA_ARGS__>& data, \
-                              Opm::Parallel::MPIComm comm); \
-template void pack(const std::vector<__VA_ARGS__>& data, \
-                   std::vector<char>& buffer, int& position, \
-                   Opm::Parallel::MPIComm comm); \
-template void unpack(std::vector<__VA_ARGS__>& data, \
-                     std::vector<char>& buffer, int& position, \
-                     Opm::Parallel::MPIComm comm);
-
-INSTANTIATE_PACK_VECTOR(float)
-INSTANTIATE_PACK_VECTOR(double)
-INSTANTIATE_PACK_VECTOR(std::vector<double>)
-INSTANTIATE_PACK_VECTOR(bool)
-INSTANTIATE_PACK_VECTOR(char)
-INSTANTIATE_PACK_VECTOR(int)
-INSTANTIATE_PACK_VECTOR(unsigned char)
-INSTANTIATE_PACK_VECTOR(unsigned int)
-INSTANTIATE_PACK_VECTOR(unsigned long int)
-INSTANTIATE_PACK_VECTOR(unsigned long long int)
-INSTANTIATE_PACK_VECTOR(std::time_t)
-INSTANTIATE_PACK_VECTOR(std::array<double, 3>)
-INSTANTIATE_PACK_VECTOR(std::pair<bool,double>)
-INSTANTIATE_PACK_VECTOR(std::map<std::string,int>)
-INSTANTIATE_PACK_VECTOR(std::pair<std::string,std::vector<size_t>>)
-INSTANTIATE_PACK_VECTOR(std::pair<int,std::vector<int>>)
-INSTANTIATE_PACK_VECTOR(std::pair<int,std::vector<size_t>>)
-INSTANTIATE_PACK_VECTOR(std::string)
-
-#undef INSTANTIATE_PACK_VECTOR
-
-#undef INSTANTIATE_PACK_SET
-
-#define INSTANTIATE_PACK(...) \
-template std::size_t packSize(const __VA_ARGS__& data, \
-                              Opm::Parallel::MPIComm comm); \
-template void pack(const __VA_ARGS__& data, \
-                   std::vector<char>& buffer, int& position, \
-                   Opm::Parallel::MPIComm comm); \
-template void unpack(__VA_ARGS__& data, \
-                     std::vector<char>& buffer, int& position, \
-                     Opm::Parallel::MPIComm comm);
-
-INSTANTIATE_PACK(float)
-INSTANTIATE_PACK(double)
-INSTANTIATE_PACK(bool)
-INSTANTIATE_PACK(int)
-INSTANTIATE_PACK(unsigned char)
-INSTANTIATE_PACK(unsigned int)
-INSTANTIATE_PACK(unsigned long int)
-INSTANTIATE_PACK(unsigned long long int)
-INSTANTIATE_PACK(std::array<short,3>)
-INSTANTIATE_PACK(std::array<bool,3>)
-INSTANTIATE_PACK(std::array<int,3>)
-INSTANTIATE_PACK(std::array<double,4>)
-INSTANTIATE_PACK(std::array<double,5>)
-INSTANTIATE_PACK(std::map<std::pair<int,int>,std::pair<bool,double>>)
-INSTANTIATE_PACK(std::optional<double>)
-INSTANTIATE_PACK(std::optional<std::string>)
-INSTANTIATE_PACK(std::pair<double, double>)
-INSTANTIATE_PACK(std::optional<std::pair<double,double>>)
-INSTANTIATE_PACK(std::map<std::string,std::vector<int>>)
-INSTANTIATE_PACK(std::map<std::string,std::map<std::pair<int,int>,int>>)
-INSTANTIATE_PACK(std::map<std::string,int>)
-INSTANTIATE_PACK(std::map<std::string,double>)
-INSTANTIATE_PACK(std::map<int,int>)
-INSTANTIATE_PACK(std::map<int,data::AquiferData>)
-INSTANTIATE_PACK(std::unordered_map<std::string,size_t>)
-INSTANTIATE_PACK(std::unordered_map<std::string,size_t,Opm::OrderedMapDetail::TruncatedStringHash<std::string::npos>, Opm::OrderedMapDetail::TruncatedStringEquals<std::string::npos>>)
-INSTANTIATE_PACK(std::unordered_map<std::string,size_t,Opm::OrderedMapDetail::TruncatedStringHash<8>, Opm::OrderedMapDetail::TruncatedStringEquals<8>>)
-INSTANTIATE_PACK(std::unordered_map<std::string,std::string>)
-INSTANTIATE_PACK(std::unordered_set<std::string>)
-INSTANTIATE_PACK(std::set<std::string>)
-INSTANTIATE_PACK(std::bitset<4>)
-
-
-#undef INSTANTIATE_PACK
-
-} // end namespace Mpi
-
-RestartValue loadParallelRestart(const EclipseIO* eclIO, Action::State& actionState, SummaryState& summaryState,
+RestartValue loadParallelRestart(const EclipseIO* eclIO,
+                                 Action::State& actionState,
+                                 SummaryState& summaryState,
                                  const std::vector<Opm::RestartKey>& solutionKeys,
                                  const std::vector<Opm::RestartKey>& extraKeys,
                                  Parallel::Communication comm)
diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp
index ba8c3de79..f90cdd34d 100644
--- a/opm/simulators/utils/ParallelRestart.hpp
+++ b/opm/simulators/utils/ParallelRestart.hpp
@@ -19,29 +19,8 @@
 #ifndef PARALLEL_RESTART_HPP
 #define PARALLEL_RESTART_HPP
 
-#if HAVE_MPI
-#include <mpi.h>
-#endif
-
-#include <opm/common/ErrorMacros.hpp>
-#include <opm/common/utility/TimeService.hpp>
-
-#include <dune/common/version.hh>
-#include <dune/common/parallel/mpihelper.hh>
-
 #include <opm/simulators/utils/ParallelCommunication.hpp>
 
-#include <bitset>
-#include <chrono>
-#include <cstddef>
-#include <optional>
-#include <map>
-#include <set>
-#include <string>
-#include <tuple>
-#include <typeinfo>
-#include <unordered_map>
-#include <unordered_set>
 #include <vector>
 
 namespace Opm
@@ -57,340 +36,13 @@ namespace Action
 class State;
 }
 
-namespace Mpi
-{
-template<class T>
-std::size_t packSize(const T*, std::size_t, Opm::Parallel::MPIComm,
-                     std::integral_constant<bool, false>);
-
-template<class T>
-std::size_t packSize(const T*, std::size_t l, Opm::Parallel::MPIComm comm,
-                     std::integral_constant<bool, true>);
-
-template<class T>
-std::size_t packSize(const T* data, std::size_t l, Opm::Parallel::MPIComm comm);
-
-template<class T>
-std::size_t packSize(const T&, Opm::Parallel::MPIComm,
-                     std::integral_constant<bool, false>)
-{
-    std::string msg = std::string{"Packing not (yet) supported for non-pod type: "} + typeid(T).name();
-    OPM_THROW(std::logic_error, msg);
-}
-
-template<class T>
-std::size_t packSize(const T&, Opm::Parallel::MPIComm comm,
-                     std::integral_constant<bool, true>)
-{
-#if HAVE_MPI
-    int size{};
-    MPI_Pack_size(1, Dune::MPITraits<T>::getType(), comm, &size);
-    return size;
-#else
-    (void) comm;
-    return 0;
-#endif
-}
-
-template<class T>
-std::size_t packSize(const T& data, Opm::Parallel::MPIComm comm)
-{
-    return packSize(data, comm, typename std::is_pod<T>::type());
-}
-
-template<class T1, class T2>
-std::size_t packSize(const std::pair<T1,T2>& data, Opm::Parallel::MPIComm comm);
-
-template<class T>
-std::size_t packSize(const std::optional<T>& data, Opm::Parallel::MPIComm comm);
-
-template<class T, class A>
-std::size_t packSize(const std::vector<T,A>& data, Opm::Parallel::MPIComm comm);
-
-template<class K, class C, class A>
-std::size_t packSize(const std::set<K,C,A>& data,
-                     Opm::Parallel::MPIComm comm);
-
-template<class T, class H, class KE, class A>
-std::size_t packSize(const std::unordered_set<T,H,KE,A>& data,
-                     Opm::Parallel::MPIComm comm);
-
-template<class A>
-std::size_t packSize(const std::vector<bool,A>& data, Opm::Parallel::MPIComm comm);
-
-template<class... Ts>
-std::size_t packSize(const std::tuple<Ts...>& data, Opm::Parallel::MPIComm comm);
-
-template<class T, std::size_t N>
-std::size_t packSize(const std::array<T,N>& data, Opm::Parallel::MPIComm comm);
-
-std::size_t packSize(const char* str, Opm::Parallel::MPIComm comm);
-
-template<class T1, class T2, class C, class A>
-std::size_t packSize(const std::map<T1,T2,C,A>& data, Opm::Parallel::MPIComm comm);
-
-template<class T1, class T2, class H, class P, class A>
-std::size_t packSize(const std::unordered_map<T1,T2,H,P,A>& data, Opm::Parallel::MPIComm comm);
-
-template<std::size_t Size>
-std::size_t packSize(const std::bitset<Size>& data, Opm::Parallel::MPIComm comm);
-
-////// pack routines
-
-template<class T>
-void pack(const T*, std::size_t, std::vector<char>&, int&,
-          Opm::Parallel::MPIComm, std::integral_constant<bool, false>);
-
-template<class T>
-void pack(const T* data, std::size_t l, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm, std::integral_constant<bool, true>);
-
-template<class T>
-void pack(const T* data, std::size_t l, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm);
-
-template<class T>
-void pack(const T&, std::vector<char>&, int&,
-          Opm::Parallel::MPIComm, std::integral_constant<bool, false>)
-{
-    OPM_THROW(std::logic_error, "Packing not (yet) supported for this non-pod type.");
-}
-
-template<class T>
-void pack(const T& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm, std::integral_constant<bool, true>)
-{
-#if HAVE_MPI
-    MPI_Pack(&data, 1, Dune::MPITraits<T>::getType(), buffer.data(),
-             buffer.size(), &position, comm);
-#else
-    (void) data;
-    (void) comm;
-    (void) buffer;
-    (void) position;
-#endif
-}
-
-template<class T>
-void pack(const T& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm)
-{
-    pack(data, buffer, position, comm, typename std::is_pod<T>::type());
-}
-
-template<class T1, class T2>
-void pack(const std::pair<T1,T2>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm);
-
-template<class T>
-void pack(const std::optional<T>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm);
-
-template<class T, class A>
-void pack(const std::vector<T,A>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm);
-
-template<class A>
-void pack(const std::vector<bool,A>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm);
-
-template<class... Ts>
-void pack(const std::tuple<Ts...>& data, std::vector<char>& buffer,
-          int& position, Opm::Parallel::MPIComm comm);
-
-template<class K, class C, class A>
-void pack(const std::set<K,C,A>& data,
-          std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm);
-
-template<class T, class H, class KE, class A>
-void pack(const std::unordered_set<T,H,KE,A>& data,
-          std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm);
-
-template<class T, size_t N>
-void pack(const std::array<T,N>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm);
-
-template<class T1, class T2, class C, class A>
-void pack(const std::map<T1,T2,C,A>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm);
-
-template<class T1, class T2, class H, class P, class A>
-void pack(const std::unordered_map<T1,T2,H,P,A>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm);
-
-void pack(const char* str, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm);
-
-template<size_t Size>
-void pack(const std::bitset<Size>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm);
-
-/// unpack routines
-
-template<class T>
-void unpack(T*, const std::size_t&, std::vector<char>&, int&,
-            Opm::Parallel::MPIComm, std::integral_constant<bool, false>);
-
-template<class T>
-void unpack(T* data, const std::size_t& l, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm,
-            std::integral_constant<bool, true>);
-
-template<class T>
-void unpack(T* data, const std::size_t& l, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm);
-
-template<class T>
-void unpack(T&, std::vector<char>&, int&,
-            Opm::Parallel::MPIComm, std::integral_constant<bool, false>)
-{
-    OPM_THROW(std::logic_error, "Packing not (yet) supported for this non-pod type.");
-}
-
-template<class T>
-void unpack(T& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm, std::integral_constant<bool, true>)
-{
-#if HAVE_MPI
-    MPI_Unpack(buffer.data(), buffer.size(), &position, &data, 1,
-               Dune::MPITraits<T>::getType(), comm);
-#else
-    (void) data;
-    (void) comm;
-    (void) buffer;
-    (void) position;
-#endif
-}
-
-template<class T>
-void unpack(T& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm)
-{
-    unpack(data, buffer, position, comm, typename std::is_pod<T>::type());
-}
-
-template<class T1, class T2>
-void unpack(std::pair<T1,T2>& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm);
-
-template<class T>
-void unpack(std::optional<T>& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm);
-
-template<class T, class A>
-void unpack(std::vector<T,A>& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm);
-
-template<class A>
-void unpack(std::vector<bool,A>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm);
-
-template<class... Ts>
-void unpack(std::tuple<Ts...>& data, std::vector<char>& buffer,
-            int& position, Opm::Parallel::MPIComm comm);
-
-template<class K, class C, class A>
-void unpack(std::set<K,C,A>& data,
-            std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm);
-
-template<class T, class H, class KE, class A>
-void unpack(std::unordered_set<T,H,KE,A>& data,
-            std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm);
-
-template<class T, size_t N>
-void unpack(std::array<T,N>& data, std::vector<char>& buffer, int& position,
-          Opm::Parallel::MPIComm comm);
-
-template<class T1, class T2, class C, class A>
-void unpack(std::map<T1,T2,C,A>& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm);
-
-template<class T1, class T2, class H, class P, class A>
-void unpack(std::unordered_map<T1,T2,H,P,A>& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm);
-
-void unpack(char* str, std::size_t length, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm);
-
-template<size_t Size>
-void unpack(std::bitset<Size>& data, std::vector<char>& buffer, int& position,
-            Opm::Parallel::MPIComm comm);
-
-/// prototypes for complex types
-
-#define ADD_PACK_PROTOTYPES(T) \
-  std::size_t packSize(const T& data, Opm::Parallel::MPIComm comm); \
-  void pack(const T& data, std::vector<char>& buffer, int& position, \
-          Opm::Parallel::MPIComm comm); \
-  void unpack(T& data, std::vector<char>& buffer, int& position, \
-              Opm::Parallel::MPIComm comm);
-
-ADD_PACK_PROTOTYPES(std::string)
-ADD_PACK_PROTOTYPES(time_point)
-
-template<typename T, typename... Args>
-void variadic_packsize(size_t& size, Parallel::Communication comm, T& first, Args&&... args)
-{
-  size += packSize(first, comm);
-  if constexpr (sizeof...(args) > 0)
-      variadic_packsize(size, comm, std::forward<Args>(args)...);
-}
-
-template<typename T, typename... Args>
-void variadic_pack(int& pos, std::vector<char>& buffer, Parallel::Communication comm, T& first, Args&&... args)
-{
-  pack(first, buffer, pos, comm);
-  if constexpr (sizeof...(args) > 0)
-      variadic_pack(pos, buffer, comm, std::forward<Args>(args)...);
-}
-
-template<typename T, typename... Args>
-void variadic_unpack(int& pos, std::vector<char>& buffer, Parallel::Communication comm, T& first, Args&&... args)
-{
-  unpack(first, buffer, pos, comm);
-  if constexpr (sizeof...(args) > 0)
-      variadic_unpack(pos, buffer, comm, std::forward<Args>(args)...);
-}
-
-#if HAVE_MPI
-template<typename... Args>
-void broadcast(Parallel::Communication comm, int root, Args&&... args)
-{
-  if (comm.size() == 1)
-      return;
-
-  size_t size = 0;
-  if (comm.rank() == root)
-      variadic_packsize(size, comm, std::forward<Args>(args)...);
-
-  comm.broadcast(&size, 1, root);
-  std::vector<char> buffer(size);
-  if (comm.rank() == root) {
-      int pos = 0;
-      variadic_pack(pos, buffer, comm, std::forward<Args>(args)...);
-  }
-  comm.broadcast(buffer.data(), size, root);
-  if (comm.rank() != root) {
-      int pos = 0;
-      variadic_unpack(pos, buffer, comm, std::forward<Args>(args)...);
-  }
-}
-#else
-template<typename... Args>
-void broadcast(Parallel::Communication, int, Args&&...)
-{}
-#endif
-
-} // end namespace Mpi
-
-RestartValue loadParallelRestart(const EclipseIO* eclIO, Action::State& actionState, SummaryState& summaryState,
+RestartValue loadParallelRestart(const EclipseIO* eclIO,
+                                 Action::State& actionState,
+                                 SummaryState& summaryState,
                                  const std::vector<RestartKey>& solutionKeys,
                                  const std::vector<RestartKey>& extraKeys,
                                  Parallel::Communication comm);
 
 } // end namespace Opm
+
 #endif // PARALLEL_RESTART_HPP
diff --git a/opm/simulators/wells/BlackoilWellModel_impl.hpp b/opm/simulators/wells/BlackoilWellModel_impl.hpp
index e6a54f44e..5f8b41d35 100644
--- a/opm/simulators/wells/BlackoilWellModel_impl.hpp
+++ b/opm/simulators/wells/BlackoilWellModel_impl.hpp
@@ -26,6 +26,7 @@
 #include <opm/input/eclipse/Units/UnitSystem.hpp>
 
 #include <opm/simulators/wells/VFPProperties.hpp>
+#include <opm/simulators/utils/MPIPacker.hpp>
 
 #include <algorithm>
 #include <utility>
diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelSerialization.cpp
similarity index 99%
rename from tests/test_ParallelRestart.cpp
rename to tests/test_ParallelSerialization.cpp
index ea9316083..5bebbc5d6 100644
--- a/tests/test_ParallelRestart.cpp
+++ b/tests/test_ParallelSerialization.cpp
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#define BOOST_TEST_MODULE TestParallelRestart
+#define BOOST_TEST_MODULE TestParallelSerialization
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>
diff --git a/tests/test_broadcast.cpp b/tests/test_broadcast.cpp
index 0fce1d833..65bf45387 100644
--- a/tests/test_broadcast.cpp
+++ b/tests/test_broadcast.cpp
@@ -25,7 +25,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <opm/simulators/utils/ParallelRestart.hpp>
+#include <opm/simulators/utils/MPIPacker.hpp>
 #include <dune/common/parallel/mpihelper.hh>
 
 #include <numeric>