diff --git a/core/include/DataSource/DataSourceItem.h b/core/include/DataSource/DataSourceItem.h
index 950d3b8..684da09 100644
--- a/core/include/DataSource/DataSourceItem.h
+++ b/core/include/DataSource/DataSourceItem.h
@@ -25,7 +25,7 @@ public:
     static const QString NAME_DATA_KEY;
 
     explicit DataSourceItem(DataSourceItemType type, const QString &name);
-    explicit DataSourceItem(DataSourceItemType type, QHash<QString, QVariant> data = {});
+    explicit DataSourceItem(DataSourceItemType type, QVariantHash data = {});
 
     /// @return the actions of the item as a vector
     QVector<DataSourceItemAction *> actions() const noexcept;
@@ -60,7 +60,7 @@ public:
     QVariant data(const QString &key) const noexcept;
 
     /// Gets all data
-    const QHash<QString, QVariant> &data() const noexcept;
+    QVariantHash data() const noexcept;
 
     bool isRoot() const noexcept;
 
diff --git a/core/src/DataSource/DataSourceItem.cpp b/core/src/DataSource/DataSourceItem.cpp
index 81dc552..48c1abd 100644
--- a/core/src/DataSource/DataSourceItem.cpp
+++ b/core/src/DataSource/DataSourceItem.cpp
@@ -6,7 +6,7 @@
 const QString DataSourceItem::NAME_DATA_KEY = QStringLiteral("name");
 
 struct DataSourceItem::DataSourceItemPrivate {
-    explicit DataSourceItemPrivate(DataSourceItemType type, QHash<QString, QVariant> data)
+    explicit DataSourceItemPrivate(DataSourceItemType type, QVariantHash data)
             : m_Parent{nullptr}, m_Children{}, m_Type{type}, m_Data{std::move(data)}, m_Actions{}
     {
     }
@@ -14,16 +14,16 @@ struct DataSourceItem::DataSourceItemPrivate {
     DataSourceItem *m_Parent;
     std::vector<std::unique_ptr<DataSourceItem> > m_Children;
     DataSourceItemType m_Type;
-    QHash<QString, QVariant> m_Data;
+    QVariantHash m_Data;
     std::vector<std::unique_ptr<DataSourceItemAction> > m_Actions;
 };
 
 DataSourceItem::DataSourceItem(DataSourceItemType type, const QString &name)
-        : DataSourceItem{type, QHash<QString, QVariant>{{NAME_DATA_KEY, name}}}
+        : DataSourceItem{type, QVariantHash{{NAME_DATA_KEY, name}}}
 {
 }
 
-DataSourceItem::DataSourceItem(DataSourceItemType type, QHash<QString, QVariant> data)
+DataSourceItem::DataSourceItem(DataSourceItemType type, QVariantHash data)
         : impl{spimpl::make_unique_impl<DataSourceItemPrivate>(type, std::move(data))}
 {
 }
@@ -70,7 +70,7 @@ QVariant DataSourceItem::data(const QString &key) const noexcept
     return impl->m_Data.value(key);
 }
 
-const QHash<QString, QVariant> &DataSourceItem::data() const noexcept
+QVariantHash DataSourceItem::data() const noexcept
 {
     return impl->m_Data;
 }