diff --git a/MVMCoreUI/Molecules/Items/ListItemModel.swift b/MVMCoreUI/Molecules/Items/ListItemModel.swift
index 5356ce25..ff9f056d 100644
--- a/MVMCoreUI/Molecules/Items/ListItemModel.swift
+++ b/MVMCoreUI/Molecules/Items/ListItemModel.swift
@@ -18,6 +18,7 @@ import MVMCore
     public var style: String? = "standard"
 
     private enum CodingKeys: String, CodingKey {
+        case moleculeName
         case backgroundColor
         case action
         case hideArrow
@@ -62,6 +63,7 @@ import MVMCore
     public override func encode(to encoder: Encoder) throws {
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
         try container.encodeModelIfPresent(action, forKey: .action)
         try container.encodeIfPresent(hideArrow, forKey: .hideArrow)
diff --git a/MVMCoreUI/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Templates/MoleculeListTemplate.swift
index a7b8d6ba..c4542898 100644
--- a/MVMCoreUI/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Templates/MoleculeListTemplate.swift
@@ -153,8 +153,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
         molecules.forEach { molecule in
             
             let data = try? JSONSerialization.data(withJSONObject: molecule)
-            let decoder = JSONDecoder()
-            let listItemModel = try? decoder.decode(ListItemModel.self, from: data!)
+            let listItemModel = try? JSONDecoder().decode(ListItemModel.self, from: data!)
             
             tmpMolecules.append(listItemModel!)
         }
@@ -162,8 +161,8 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
         DispatchQueue.main.async {
             guard let indexPath = self.tableView?.indexPath(for: sender) else { return }
             var indexPaths: [IndexPath] = []
-            for molecule in molecules {
-                if let info = self.getMoleculeInfo(with: tmpMolecules as! ListItemModelProtocol) {
+            for molecule in tmpMolecules {
+                if let info = self.getMoleculeInfo(with: molecule) {
                     self.tableView?.register(info.class, forCellReuseIdentifier: info.identifier)
                     let index = indexPath.row + 1 + indexPaths.count
                     self.moleculesInfo?.insert(info, at: index)