diff --git a/core/src/DataSource/DataSourceController.cpp b/core/src/DataSource/DataSourceController.cpp
index 12243c1..f41d211 100644
--- a/core/src/DataSource/DataSourceController.cpp
+++ b/core/src/DataSource/DataSourceController.cpp
@@ -88,7 +88,8 @@ void DataSourceController::setDataProvider(const QUuid &dataSourceUid,
 void DataSourceController::loadProductItem(const QUuid &dataSourceUid,
                                            const DataSourceItem &productItem) noexcept
 {
-    if (productItem.type() == DataSourceItemType::PRODUCT) {
+    if (productItem.type() == DataSourceItemType::PRODUCT
+        || productItem.type() == DataSourceItemType::COMPONENT) {
         /// Retrieves the data provider of the data source (if any)
         auto it = impl->m_DataProviders.find(dataSourceUid);
         auto dataProvider = (it != impl->m_DataProviders.end()) ? it->second : nullptr;
diff --git a/plugins/amda/src/AmdaPlugin.cpp b/plugins/amda/src/AmdaPlugin.cpp
index af18f76..1fd9955 100644
--- a/plugins/amda/src/AmdaPlugin.cpp
+++ b/plugins/amda/src/AmdaPlugin.cpp
@@ -20,16 +20,21 @@ const auto JSON_FILE_PATH = QStringLiteral(":/samples/AmdaSample.json");
 
 void associateActions(DataSourceItem &item, const QUuid &dataSourceUid)
 {
-    if (item.type() == DataSourceItemType::PRODUCT) {
-        auto itemName = item.name();
-
-        item.addAction(std::make_unique<DataSourceItemAction>(
-            QObject::tr("Load %1 product").arg(itemName),
-            [itemName, dataSourceUid](DataSourceItem &item) {
+    auto addLoadAction = [&item, dataSourceUid](const QString &label) {
+        item.addAction(
+            std::make_unique<DataSourceItemAction>(label, [dataSourceUid](DataSourceItem &item) {
                 if (auto app = sqpApp) {
                     app->dataSourceController().loadProductItem(dataSourceUid, item);
                 }
             }));
+    };
+
+    const auto itemType = item.type();
+    if (itemType == DataSourceItemType::PRODUCT) {
+        addLoadAction(QObject::tr("Load %1 product").arg(item.name()));
+    }
+    else if (itemType == DataSourceItemType::COMPONENT) {
+        addLoadAction(QObject::tr("Load %1 component").arg(item.name()));
     }
 
     auto count = item.childCount();