diff --git a/Panels/ProductCard.js b/Panels/ProductCard.js
index 990f6a76e..49eba7250 100644
--- a/Panels/ProductCard.js
+++ b/Panels/ProductCard.js
@@ -152,10 +152,13 @@ function newProductCard () {
 
       let team = ecosystem.getTeam(thisObject.product.plotter.devTeam)
       let plotter = ecosystem.getPlotter(team, thisObject.product.plotter.codeName)
-      let plotterModule = ecosystem.getPlotterModule(plotter, thisObject.product.plotter.moduleName)
 
-      thisObject.product.plotter.profilePicture = plotterModule.profilePicture
-      thisObject.product.plotter.module = plotterModule
+      if (plotter !== undefined) {
+        let plotterModule = ecosystem.getPlotterModule(plotter, thisObject.product.plotter.moduleName)
+
+        thisObject.product.plotter.profilePicture = plotterModule.profilePicture
+        thisObject.product.plotter.module = plotterModule
+      }
 
        /* Lets set the basic dimensions of this thisObject. */
 
diff --git a/Panels/ProductsPanel.js b/Panels/ProductsPanel.js
index c5a150fae..7593570f0 100644
--- a/Panels/ProductsPanel.js
+++ b/Panels/ProductsPanel.js
@@ -111,7 +111,7 @@ function newProductsPanel () {
             continue
           }
 
-          for (let k = 0; k < botNode.products; k++) {
+          for (let k = 0; k < botNode.products.length; k++) {
             let productNode = botNode.products[k]
 
             let product = {}
@@ -123,17 +123,17 @@ function newProductsPanel () {
               continue
             }
 
-            if (productNode.referenceParent === undefined) { continue }
-            let plotterModuleNode = productNode.referenceParent
+            if (productNode.payload.referenceParent === undefined) { continue }
+            let plotterModuleNode = productNode.payload.referenceParent
 
-            let plotterModule = {}
-            if (plotterModuleNode.code === undefined) { continue }
-            try {
-              let code = JSON.parse(plotterModuleNode.code)
-              plotterModule.codeName = code.codeName
-            } catch (err) {
-              continue
-            }
+            let plotterModule = {}// Provitional code until CODE desambiguation is done.
+            // if (plotterModuleNode.code === undefined) { continue }
+            // try {
+            //  let code = JSON.parse(plotterModuleNode.code)
+            plotterModule.codeName = plotterModuleNode.name // code.codeName
+            // } catch (err) {
+            //  continue
+            // }
 
             if (plotterModuleNode.payload.parentNode === undefined) { continue }
             let plotterNode = plotterModuleNode.payload.parentNode
@@ -160,9 +160,25 @@ function newProductsPanel () {
             }
 
             /* Conversion to fit old format */
-            prduct.plotter = plotter
-            prduct.plotter.devTeam = plotterTeam.codeName
+            product.plotter = plotter
+            product.plotter.devTeam = plotterTeam.codeName
             product.plotter.moduleName = plotterModule.codeName
+            product.displayName = productNode.name
+            product.dataSets = []
+            team.displayName = teamNode.name
+            bot.displayName = botNode.name
+
+            for (let m = 0; m < productNode.datasets.length; m++) {
+              let dataset = productNode.datasets[m]
+
+              if (dataset.code === undefined) { continue }
+              try {
+                let code = JSON.parse(dataset.code)
+                product.dataSets.push(code)
+              } catch (err) {
+                continue
+              }
+            }
 
             addProductCard(team, bot, product)
           }