diff --git a/src/ConvertToImagesDatasetDialog.h b/src/ConvertToImagesDatasetDialog.h
index 586c570e..bd1eef9b 100644
--- a/src/ConvertToImagesDatasetDialog.h
+++ b/src/ConvertToImagesDatasetDialog.h
@@ -76,4 +76,4 @@ class ConvertToImagesDatasetDialog : public QDialog
     StringAction                        _numberOfPixelsAction;          /** Number of pixels action */
     ToggleAction                        _useLinkedDataAction;           /** Use linked data action */
     GroupAction                         _groupAction;                   /** Group action */
-};
\ No newline at end of file
+};
diff --git a/src/EditLayerAction.h b/src/EditLayerAction.h
index 5aaaa30e..556ab381 100644
--- a/src/EditLayerAction.h
+++ b/src/EditLayerAction.h
@@ -27,4 +27,4 @@ class EditLayerAction : public GroupsAction
 
 Q_DECLARE_METATYPE(EditLayerAction)
 
-inline const auto editLayerActionMetaTypeId = qRegisterMetaType<EditLayerAction*>("EditLayerAction");
\ No newline at end of file
+inline const auto editLayerActionMetaTypeId = qRegisterMetaType<EditLayerAction*>("EditLayerAction");
diff --git a/src/ExportToImageDialog.h b/src/ExportToImageDialog.h
index 6c585efd..4f19e2e3 100644
--- a/src/ExportToImageDialog.h
+++ b/src/ExportToImageDialog.h
@@ -47,4 +47,4 @@ class ExportToImageDialog : public QDialog
     DecimalAction       _imageScaleFactorAction;    /** Image scale factor action */
     StringAction        _imageResolutionAction;     /** Image resolution action */
     GroupAction         _groupAction;               /** Group action */
-};
\ No newline at end of file
+};
diff --git a/src/GeneralAction.cpp b/src/GeneralAction.cpp
index de49d898..66620dd4 100644
--- a/src/GeneralAction.cpp
+++ b/src/GeneralAction.cpp
@@ -115,7 +115,7 @@ void GeneralAction::disconnectFromPublicAction(bool recursive)
     GroupAction::disconnectFromPublicAction(recursive);
 }
 
-void GeneralAction::fromVariantMap(const QVariantMap& variantMap)
+void GeneralAction::fromVariantMap(const mv::VariantMap& variantMap)
 {
     GroupAction::fromVariantMap(variantMap);
 
@@ -126,7 +126,7 @@ void GeneralAction::fromVariantMap(const QVariantMap& variantMap)
     _scaleAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap GeneralAction::toVariantMap() const
+mv::VariantMap GeneralAction::toVariantMap() const
 {
     auto variantMap = GroupAction::toVariantMap();
 
@@ -137,4 +137,4 @@ QVariantMap GeneralAction::toVariantMap() const
     _scaleAction.insertIntoVariantMap(variantMap);
 
     return variantMap;
-}
\ No newline at end of file
+}
diff --git a/src/GeneralAction.h b/src/GeneralAction.h
index e3546178..34699f87 100644
--- a/src/GeneralAction.h
+++ b/src/GeneralAction.h
@@ -59,13 +59,13 @@ class GeneralAction : public GroupAction
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 public: /** Action getters */
 
@@ -88,4 +88,4 @@ class GeneralAction : public GroupAction
 
 Q_DECLARE_METATYPE(GeneralAction)
 
-inline const auto generalActionMetaTypeId = qRegisterMetaType<GeneralAction*>("GeneralAction");
\ No newline at end of file
+inline const auto generalActionMetaTypeId = qRegisterMetaType<GeneralAction*>("GeneralAction");
diff --git a/src/ImageSettingsAction.cpp b/src/ImageSettingsAction.cpp
index 93248005..42046886 100644
--- a/src/ImageSettingsAction.cpp
+++ b/src/ImageSettingsAction.cpp
@@ -422,7 +422,7 @@ void ImageSettingsAction::disconnectFromPublicAction(bool recursive)
     GroupAction::disconnectFromPublicAction(recursive);
 }
 
-void ImageSettingsAction::fromVariantMap(const QVariantMap& variantMap)
+void ImageSettingsAction::fromVariantMap(const mv::VariantMap& variantMap)
 {
     GroupAction::fromVariantMap(variantMap);
 
@@ -439,7 +439,7 @@ void ImageSettingsAction::fromVariantMap(const QVariantMap& variantMap)
     _constantColorAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap ImageSettingsAction::toVariantMap() const
+mv::VariantMap ImageSettingsAction::toVariantMap() const
 {
     auto variantMap = GroupAction::toVariantMap();
 
@@ -456,4 +456,4 @@ QVariantMap ImageSettingsAction::toVariantMap() const
     _constantColorAction.insertIntoVariantMap(variantMap);
 
     return variantMap;
-}
\ No newline at end of file
+}
diff --git a/src/ImageSettingsAction.h b/src/ImageSettingsAction.h
index 86879395..aa2eaa2a 100644
--- a/src/ImageSettingsAction.h
+++ b/src/ImageSettingsAction.h
@@ -78,13 +78,13 @@ class ImageSettingsAction : public GroupAction
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 public: // Action getters
 
@@ -132,4 +132,4 @@ class ImageSettingsAction : public GroupAction
 
 Q_DECLARE_METATYPE(ImageSettingsAction)
 
-inline const auto imageSettingsActionMetaTypeId = qRegisterMetaType<ImageSettingsAction*>("ImageSettingsAction");
\ No newline at end of file
+inline const auto imageSettingsActionMetaTypeId = qRegisterMetaType<ImageSettingsAction*>("ImageSettingsAction");
diff --git a/src/ImageViewerPlugin.cpp b/src/ImageViewerPlugin.cpp
index ba716e85..fc7d00d4 100644
--- a/src/ImageViewerPlugin.cpp
+++ b/src/ImageViewerPlugin.cpp
@@ -398,7 +398,7 @@ void ImageViewerPlugin::immigrateDataset(const Dataset<DatasetImpl>& dataset)
     }
 }
 
-void ImageViewerPlugin::fromVariantMap(const QVariantMap& variantMap)
+void ImageViewerPlugin::fromVariantMap(const mv::VariantMap& variantMap)
 {
     ViewPlugin::fromVariantMap(variantMap);
 
@@ -407,7 +407,7 @@ void ImageViewerPlugin::fromVariantMap(const QVariantMap& variantMap)
     _interactionToolbarAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap ImageViewerPlugin::toVariantMap() const
+mv::VariantMap ImageViewerPlugin::toVariantMap() const
 {
     auto variantMap = ViewPlugin::toVariantMap();
 
@@ -482,4 +482,4 @@ PluginTriggerActions ImageViewerPluginFactory::getPluginTriggerActions(const mv:
     }
 
 	return pluginTriggerActions;
-}
\ No newline at end of file
+}
diff --git a/src/ImageViewerPlugin.h b/src/ImageViewerPlugin.h
index cbcf75c9..b538239e 100644
--- a/src/ImageViewerPlugin.h
+++ b/src/ImageViewerPlugin.h
@@ -100,13 +100,13 @@ class ImageViewerPlugin : public ViewPlugin
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 public: // Action getters
 
@@ -160,4 +160,4 @@ class ImageViewerPluginFactory : public ViewPluginFactory
      * @return Vector of plugin trigger actions
      */
     PluginTriggerActions getPluginTriggerActions(const mv::Datasets& datasets) const override;
-};
\ No newline at end of file
+};
diff --git a/src/ImageViewerPlugin.json b/src/ImageViewerPlugin.json
index 15609656..0670e0ce 100644
--- a/src/ImageViewerPlugin.json
+++ b/src/ImageViewerPlugin.json
@@ -2,4 +2,4 @@
   "name" : "Image Viewer",
   "version" : "0.1.0",
   "dependencies": ["Images"]
-}
\ No newline at end of file
+}
diff --git a/src/InteractionToolbarAction.cpp b/src/InteractionToolbarAction.cpp
index bd55021e..8cfafe07 100644
--- a/src/InteractionToolbarAction.cpp
+++ b/src/InteractionToolbarAction.cpp
@@ -220,7 +220,7 @@ ImageViewerWidget& InteractionToolbarAction::getImageViewerWidget()
     return _imageViewerPlugin->getImageViewerWidget();
 }
 
-void InteractionToolbarAction::fromVariantMap(const QVariantMap& variantMap)
+void InteractionToolbarAction::fromVariantMap(const mv::VariantMap& variantMap)
 {
     HorizontalToolbarAction::fromVariantMap(variantMap);
 
@@ -228,7 +228,7 @@ void InteractionToolbarAction::fromVariantMap(const QVariantMap& variantMap)
     _viewSettingsAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap InteractionToolbarAction::toVariantMap() const
+mv::VariantMap InteractionToolbarAction::toVariantMap() const
 {
     auto variantMap = HorizontalToolbarAction::toVariantMap();
 
@@ -236,4 +236,4 @@ QVariantMap InteractionToolbarAction::toVariantMap() const
     _viewSettingsAction.insertIntoVariantMap(variantMap);
 
     return variantMap;
-}
\ No newline at end of file
+}
diff --git a/src/InteractionToolbarAction.h b/src/InteractionToolbarAction.h
index 688d3199..3d92d3fd 100644
--- a/src/InteractionToolbarAction.h
+++ b/src/InteractionToolbarAction.h
@@ -49,13 +49,13 @@ class InteractionToolbarAction : public HorizontalToolbarAction
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 public: // Action getters
 
@@ -89,4 +89,4 @@ class InteractionToolbarAction : public HorizontalToolbarAction
 
 Q_DECLARE_METATYPE(InteractionToolbarAction)
 
-inline const auto interactionToolbarActionMetaTypeId = qRegisterMetaType<InteractionToolbarAction*>("InteractionToolbarAction");
\ No newline at end of file
+inline const auto interactionToolbarActionMetaTypeId = qRegisterMetaType<InteractionToolbarAction*>("InteractionToolbarAction");
diff --git a/src/Layer.cpp b/src/Layer.cpp
index f4dba3fd..d1de271c 100644
--- a/src/Layer.cpp
+++ b/src/Layer.cpp
@@ -1064,7 +1064,7 @@ void Layer::zoomToSelection()
     }
 }
 
-void Layer::fromVariantMap(const QVariantMap& variantMap)
+void Layer::fromVariantMap(const mv::VariantMap& variantMap)
 {
     WidgetAction::fromVariantMap(variantMap);
 
@@ -1082,7 +1082,7 @@ void Layer::fromVariantMap(const QVariantMap& variantMap)
     _subsetAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap Layer::toVariantMap() const
+mv::VariantMap Layer::toVariantMap() const
 {
     auto variantMap = WidgetAction::toVariantMap();
 
@@ -1098,4 +1098,4 @@ QVariantMap Layer::toVariantMap() const
     _subsetAction.insertIntoVariantMap(variantMap);
 
     return variantMap;
-}
\ No newline at end of file
+}
diff --git a/src/Layer.h b/src/Layer.h
index a266fa3c..e0ef16c6 100644
--- a/src/Layer.h
+++ b/src/Layer.h
@@ -202,13 +202,13 @@ class Layer : public mv::gui::GroupsAction, public Renderable
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
     
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 public: /** Action getters */
 
diff --git a/src/LayersFilterModel.cpp b/src/LayersFilterModel.cpp
index e7ebbfe1..2b1658fb 100644
--- a/src/LayersFilterModel.cpp
+++ b/src/LayersFilterModel.cpp
@@ -22,4 +22,4 @@ bool LayersFilterModel::filterAcceptsRow(int row, const QModelIndex& parent) con
 bool LayersFilterModel::lessThan(const QModelIndex& lhs, const QModelIndex& rhs) const
 {
     return lhs.data().toString() < rhs.data().toString();
-}
\ No newline at end of file
+}
diff --git a/src/LayersModel.cpp b/src/LayersModel.cpp
index 5b951ad1..bcb04e4b 100644
--- a/src/LayersModel.cpp
+++ b/src/LayersModel.cpp
@@ -538,7 +538,7 @@ LayersModel::Layers LayersModel::getLayers() const
     return layers;
 }
 
-void LayersModel::fromVariantMap(const QVariantMap& variantMap)
+void LayersModel::fromVariantMap(const mv::VariantMap& variantMap)
 {
     Serializable::fromVariantMap(variantMap);
 
@@ -561,7 +561,7 @@ void LayersModel::fromVariantMap(const QVariantMap& variantMap)
     imageViewerPlugin->getInteractionToolbarAction().getZoomExtentsAction().trigger();
 }
 
-QVariantMap LayersModel::toVariantMap() const
+mv::VariantMap LayersModel::toVariantMap() const
 {
     auto variantMap = Serializable::toVariantMap();
 
diff --git a/src/LayersModel.h b/src/LayersModel.h
index 61ac507e..642b483c 100644
--- a/src/LayersModel.h
+++ b/src/LayersModel.h
@@ -344,11 +344,11 @@ class LayersModel final : public QStandardItemModel, public mv::util::Serializab
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
     
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 };
diff --git a/src/MiscellaneousAction.h b/src/MiscellaneousAction.h
index f1956bfe..0140d410 100644
--- a/src/MiscellaneousAction.h
+++ b/src/MiscellaneousAction.h
@@ -44,4 +44,4 @@ class MiscellaneousAction : public GroupAction
 
 Q_DECLARE_METATYPE(MiscellaneousAction)
 
-inline const auto miscellaneousActionMetaTypeId = qRegisterMetaType<MiscellaneousAction*>("MiscellaneousAction");
\ No newline at end of file
+inline const auto miscellaneousActionMetaTypeId = qRegisterMetaType<MiscellaneousAction*>("MiscellaneousAction");
diff --git a/src/PositionAction.cpp b/src/PositionAction.cpp
index 9d71acc4..ac5490b5 100644
--- a/src/PositionAction.cpp
+++ b/src/PositionAction.cpp
@@ -60,7 +60,7 @@ void PositionAction::disconnectFromPublicAction(bool recursive)
     GroupAction::disconnectFromPublicAction(recursive);
 }
 
-void PositionAction::fromVariantMap(const QVariantMap& variantMap)
+void PositionAction::fromVariantMap(const mv::VariantMap& variantMap)
 {
     GroupAction::fromVariantMap(variantMap);
 
@@ -68,7 +68,7 @@ void PositionAction::fromVariantMap(const QVariantMap& variantMap)
     _yAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap PositionAction::toVariantMap() const
+mv::VariantMap PositionAction::toVariantMap() const
 {
     auto variantMap = GroupAction::toVariantMap();
 
@@ -76,4 +76,4 @@ QVariantMap PositionAction::toVariantMap() const
     _yAction.insertIntoVariantMap(variantMap);
 
     return variantMap;
-}
\ No newline at end of file
+}
diff --git a/src/PositionAction.h b/src/PositionAction.h
index e7e99685..9f84b42a 100644
--- a/src/PositionAction.h
+++ b/src/PositionAction.h
@@ -48,13 +48,13 @@ class PositionAction : public GroupAction
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 signals:
 
@@ -73,4 +73,4 @@ class PositionAction : public GroupAction
 
 Q_DECLARE_METATYPE(PositionAction)
 
-inline const auto positionActionMetaTypeId = qRegisterMetaType<PositionAction*>("PositionAction");
\ No newline at end of file
+inline const auto positionActionMetaTypeId = qRegisterMetaType<PositionAction*>("PositionAction");
diff --git a/src/Prop.h b/src/Prop.h
index 1c5d494f..17251c28 100644
--- a/src/Prop.h
+++ b/src/Prop.h
@@ -180,4 +180,4 @@ class Prop
     QMap<QString, QSharedPointer<QOpenGLShaderProgram>>     _shaderPrograms;        /** OpenGL shader programs */
     QMap<QString, QSharedPointer<QOpenGLTexture>>           _textures;              /** OpenGL textures */
     QMap<QString, QSharedPointer<Shape>>                    _shapes;                /** Shapes */
-};
\ No newline at end of file
+};
diff --git a/src/QuadShape.cpp b/src/QuadShape.cpp
index 2fbb30d2..46d0cc00 100644
--- a/src/QuadShape.cpp
+++ b/src/QuadShape.cpp
@@ -110,4 +110,4 @@ void QuadShape::createQuad()
         _vbo.allocate(_vertexData.constData(), _vertexData.count() * sizeof(GLfloat));
         _vbo.release();
     }
-}
\ No newline at end of file
+}
diff --git a/src/QuadShape.h b/src/QuadShape.h
index fbcf32ac..30b2c4a3 100644
--- a/src/QuadShape.h
+++ b/src/QuadShape.h
@@ -63,4 +63,4 @@ class QuadShape : public Shape
 protected:
     QRectF                  _rectangle;             /** Rectangle (in world space) that defines the quad */
     QVector<GLfloat>        _vertexData;            /** Quad vertex data */
-};
\ No newline at end of file
+};
diff --git a/src/Renderable.h b/src/Renderable.h
index 974db410..ae7745d4 100644
--- a/src/Renderable.h
+++ b/src/Renderable.h
@@ -109,4 +109,4 @@ class Renderable
     LayersRenderer* _renderer;      /** Pointer to the renderer in which the renderable object will reside */
     QMatrix4x4      _modelMatrix;   /** Model matrix */
     QVector<Prop*>  _props;         /** Props */
-};
\ No newline at end of file
+};
diff --git a/src/ScalarChannelAction.cpp b/src/ScalarChannelAction.cpp
index 0d3be41a..5dffecae 100644
--- a/src/ScalarChannelAction.cpp
+++ b/src/ScalarChannelAction.cpp
@@ -207,7 +207,7 @@ void ScalarChannelAction::disconnectFromPublicAction(bool recursive)
     GroupAction::disconnectFromPublicAction(recursive);
 }
 
-void ScalarChannelAction::fromVariantMap(const QVariantMap& variantMap)
+void ScalarChannelAction::fromVariantMap(const mv::VariantMap& variantMap)
 {
     GroupAction::fromVariantMap(variantMap);
 
@@ -215,7 +215,7 @@ void ScalarChannelAction::fromVariantMap(const QVariantMap& variantMap)
     _windowLevelAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap ScalarChannelAction::toVariantMap() const
+mv::VariantMap ScalarChannelAction::toVariantMap() const
 {
     auto variantMap = GroupAction::toVariantMap();
 
@@ -223,4 +223,4 @@ QVariantMap ScalarChannelAction::toVariantMap() const
     _windowLevelAction.insertIntoVariantMap(variantMap);
 
     return variantMap;
-}
\ No newline at end of file
+}
diff --git a/src/ScalarChannelAction.h b/src/ScalarChannelAction.h
index 06d4d133..9e589b52 100644
--- a/src/ScalarChannelAction.h
+++ b/src/ScalarChannelAction.h
@@ -99,13 +99,13 @@ class ScalarChannelAction : public GroupAction
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 signals:
 
@@ -132,4 +132,4 @@ class ScalarChannelAction : public GroupAction
 
 Q_DECLARE_METATYPE(ScalarChannelAction)
 
-inline const auto scalarChannelActionMetaTypeId = qRegisterMetaType<ScalarChannelAction*>("ScalarChannelAction");
\ No newline at end of file
+inline const auto scalarChannelActionMetaTypeId = qRegisterMetaType<ScalarChannelAction*>("ScalarChannelAction");
diff --git a/src/SelectionAction.cpp b/src/SelectionAction.cpp
index 58ebc236..ac6a0c8f 100644
--- a/src/SelectionAction.cpp
+++ b/src/SelectionAction.cpp
@@ -114,7 +114,7 @@ void SelectionAction::disconnectFromPublicAction(bool recursive)
     GroupAction::disconnectFromPublicAction(recursive);
 }
 
-void SelectionAction::fromVariantMap(const QVariantMap& variantMap)
+void SelectionAction::fromVariantMap(const mv::VariantMap& variantMap)
 {
     WidgetAction::fromVariantMap(variantMap);
 
@@ -122,7 +122,7 @@ void SelectionAction::fromVariantMap(const QVariantMap& variantMap)
     _showRegionAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap SelectionAction::toVariantMap() const
+mv::VariantMap SelectionAction::toVariantMap() const
 {
     auto variantMap = WidgetAction::toVariantMap();
 
@@ -130,4 +130,4 @@ QVariantMap SelectionAction::toVariantMap() const
     _showRegionAction.insertIntoVariantMap(variantMap);
 
     return variantMap;
-}
\ No newline at end of file
+}
diff --git a/src/SelectionAction.h b/src/SelectionAction.h
index c613999b..0e8c72b3 100644
--- a/src/SelectionAction.h
+++ b/src/SelectionAction.h
@@ -66,13 +66,13 @@ class SelectionAction : public GroupAction
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 public: // Action getters
 
@@ -89,4 +89,4 @@ class SelectionAction : public GroupAction
 
 Q_DECLARE_METATYPE(SelectionAction)
 
-inline const auto selectionActionMetaTypeId = qRegisterMetaType<SelectionAction*>("SelectionAction");
\ No newline at end of file
+inline const auto selectionActionMetaTypeId = qRegisterMetaType<SelectionAction*>("SelectionAction");
diff --git a/src/SelectionProp.h b/src/SelectionProp.h
index f3eea6d3..b21019cd 100644
--- a/src/SelectionProp.h
+++ b/src/SelectionProp.h
@@ -57,4 +57,4 @@ class SelectionProp : public Prop
 
 protected:
     Layer&      _layer;     /** Reference to layer */
-};
\ No newline at end of file
+};
diff --git a/src/SelectionToolProp.cpp b/src/SelectionToolProp.cpp
index b3fb4c9f..7ea591b5 100644
--- a/src/SelectionToolProp.cpp
+++ b/src/SelectionToolProp.cpp
@@ -474,4 +474,4 @@ void SelectionToolProp::loadSelectionToolOffScreenShaderProgram()
         shape->getVAO().release();
     }
     shape->getVBO().release();
-}
\ No newline at end of file
+}
diff --git a/src/SelectionToolProp.h b/src/SelectionToolProp.h
index 1754c195..203f6e83 100644
--- a/src/SelectionToolProp.h
+++ b/src/SelectionToolProp.h
@@ -72,4 +72,4 @@ class SelectionToolProp : public Prop
 private:
     Layer&                                      _layer;     /** Reference to layer */
     QScopedPointer<QOpenGLFramebufferObject>    _fbo;       /** Frame Buffer Object for off screen pixel selection tools */
-};
\ No newline at end of file
+};
diff --git a/src/SelectionToolbarAction.cpp b/src/SelectionToolbarAction.cpp
index 4880f062..e998108e 100644
--- a/src/SelectionToolbarAction.cpp
+++ b/src/SelectionToolbarAction.cpp
@@ -140,4 +140,4 @@ void SelectionToolbarAction::setupInteraction()
             connect(&pixelSelectionAction.getModifierAction(), &QAction::enabledChanged, this, updateReadOnly);
         }
     });
-}
\ No newline at end of file
+}
diff --git a/src/SubsetAction.cpp b/src/SubsetAction.cpp
index e88ea915..48d4378f 100644
--- a/src/SubsetAction.cpp
+++ b/src/SubsetAction.cpp
@@ -108,7 +108,7 @@ void SubsetAction::disconnectFromPublicAction(bool recursive)
     GroupAction::disconnectFromPublicAction(recursive);
 }
 
-void SubsetAction::fromVariantMap(const QVariantMap& variantMap)
+void SubsetAction::fromVariantMap(const mv::VariantMap& variantMap)
 {
     GroupAction::fromVariantMap(variantMap);
 
@@ -116,7 +116,7 @@ void SubsetAction::fromVariantMap(const QVariantMap& variantMap)
     _createAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap SubsetAction::toVariantMap() const
+mv::VariantMap SubsetAction::toVariantMap() const
 {
     auto variantMap = GroupAction::toVariantMap();
 
diff --git a/src/SubsetAction.h b/src/SubsetAction.h
index 969c09db..14b94986 100644
--- a/src/SubsetAction.h
+++ b/src/SubsetAction.h
@@ -55,13 +55,13 @@ class SubsetAction : public GroupAction
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 public: // Action getters
 
@@ -76,4 +76,4 @@ class SubsetAction : public GroupAction
 
 Q_DECLARE_METATYPE(SubsetAction)
 
-inline const auto subsetActionMetaTypeId = qRegisterMetaType<SubsetAction*>("SubsetAction");
\ No newline at end of file
+inline const auto subsetActionMetaTypeId = qRegisterMetaType<SubsetAction*>("SubsetAction");
diff --git a/src/ViewSettingsAction.cpp b/src/ViewSettingsAction.cpp
index e63a9f54..0bdbf6c4 100644
--- a/src/ViewSettingsAction.cpp
+++ b/src/ViewSettingsAction.cpp
@@ -101,7 +101,7 @@ void ViewSettingsAction::disconnectFromPublicAction(bool recursive)
     GroupAction::disconnectFromPublicAction(recursive);
 }
 
-void ViewSettingsAction::fromVariantMap(const QVariantMap& variantMap)
+void ViewSettingsAction::fromVariantMap(const mv::VariantMap& variantMap)
 {
     GroupAction::fromVariantMap(variantMap);
 
@@ -111,7 +111,7 @@ void ViewSettingsAction::fromVariantMap(const QVariantMap& variantMap)
     _smartZoomAction.fromParentVariantMap(variantMap);
 }
 
-QVariantMap ViewSettingsAction::toVariantMap() const
+mv::VariantMap ViewSettingsAction::toVariantMap() const
 {
     auto variantMap = GroupAction::toVariantMap();
 
diff --git a/src/ViewSettingsAction.h b/src/ViewSettingsAction.h
index 4c96dee5..57d01724 100644
--- a/src/ViewSettingsAction.h
+++ b/src/ViewSettingsAction.h
@@ -56,13 +56,13 @@ class ViewSettingsAction : public GroupAction
      * Load widget action from variant map
      * @param Variant map representation of the widget action
      */
-    void fromVariantMap(const QVariantMap& variantMap) override;
+    void fromVariantMap(const mv::VariantMap& variantMap) override;
 
     /**
      * Save widget action to variant map
      * @return Variant map representation of the widget action
      */
-    QVariantMap toVariantMap() const override;
+    mv::VariantMap toVariantMap() const override;
 
 public: // Action getters
 
@@ -81,4 +81,4 @@ class ViewSettingsAction : public GroupAction
 
 Q_DECLARE_METATYPE(ViewSettingsAction)
 
-inline const auto viewSettingsActionMetaTypeId = qRegisterMetaType<ViewSettingsAction*>("ViewSettingsAction");
\ No newline at end of file
+inline const auto viewSettingsActionMetaTypeId = qRegisterMetaType<ViewSettingsAction*>("ViewSettingsAction");