diff --git a/MVMCoreUI/BaseControllers/MFViewController+Model.swift b/MVMCoreUI/BaseControllers/MFViewController+Model.swift
index e70e68f6..05e506eb 100644
--- a/MVMCoreUI/BaseControllers/MFViewController+Model.swift
+++ b/MVMCoreUI/BaseControllers/MFViewController+Model.swift
@@ -31,9 +31,10 @@ extension MFViewController: MoleculeDelegateProtocol {
         return nil
     }
     
-    @objc public func moleculeLayoutUpdated(_ molecule: UIView & MVMCoreUIMoleculeViewProtocol) { }
+    // These are required because swift will call the extension function otherwise.
+    @objc public func moleculeLayoutUpdated(_ molecule: UIView & MVMCoreUIMoleculeViewProtocol) {}
     
-    @objc public func addMolecules(_ molecules: [[AnyHashable: Any]], sender: UITableViewCell, animation: UITableView.RowAnimation) { }
-    
-    @objc public func removeMolecules(_ molecules: [[AnyHashable: Any]], sender: UITableViewCell, animation: UITableView.RowAnimation) { }
+    @objc public func addMolecules(_ molecules: [[AnyHashable: Any]], sender: UITableViewCell, animation: UITableView.RowAnimation) {}
+    @objc public func addMolecules(_ molecules: [[AnyHashable : Any]], indexPath: IndexPath, animation: UITableView.RowAnimation) {}
+    @objc public func removeMolecules(_ molecules: [[AnyHashable: Any]], sender: UITableViewCell, animation: UITableView.RowAnimation) {}
 }
diff --git a/MVMCoreUI/OtherHandlers/ModelMoleculeDelegateProtocol.swift b/MVMCoreUI/OtherHandlers/ModelMoleculeDelegateProtocol.swift
index d3a2fe80..eb175c3a 100644
--- a/MVMCoreUI/OtherHandlers/ModelMoleculeDelegateProtocol.swift
+++ b/MVMCoreUI/OtherHandlers/ModelMoleculeDelegateProtocol.swift
@@ -20,6 +20,8 @@ public protocol MoleculeDelegateProtocol {
     /// Asks the delegate to add or remove molecules.
     //optional
     func addMolecules(_ molecules: [[AnyHashable : Any]], sender: UITableViewCell, animation: UITableView.RowAnimation)
+    func addMolecules(_ molecules: [[AnyHashable : Any]], indexPath: IndexPath, animation: UITableView.RowAnimation)
+
     func removeMolecules(_ molecules: [[AnyHashable : Any]], sender: UITableViewCell, animation: UITableView.RowAnimation)
 
     //optional
@@ -36,6 +38,10 @@ extension MoleculeDelegateProtocol {
         // Do nothing
     }
     
+    public func addMolecules(_ molecules: [[AnyHashable : Any]], indexPath: IndexPath, animation: UITableView.RowAnimation) {
+        // Do nothing
+    }
+    
     public func removeMolecules(_ molecules: [[AnyHashable : Any]], sender: UITableViewCell, animation: UITableView.RowAnimation) {
         // Do nothing
     }
diff --git a/MVMCoreUI/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Templates/MoleculeListTemplate.swift
index a4078f17..1dfb0938 100644
--- a/MVMCoreUI/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Templates/MoleculeListTemplate.swift
@@ -178,8 +178,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
         }
     }
     
-    open override func addMolecules(_ molecules: [[AnyHashable: Any]], sender: UITableViewCell, animation: UITableView.RowAnimation) {
-        
+    open override func addMolecules(_ molecules: [[AnyHashable : Any]], indexPath: IndexPath, animation: UITableView.RowAnimation) {
         var tmpMolecules = [ListItemModelProtocol & MoleculeModelProtocol]()
         
         molecules.forEach { molecule in
@@ -189,7 +188,6 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
         }
         
         DispatchQueue.main.async {
-            guard let indexPath = self.tableView?.indexPath(for: sender) else { return }
             var indexPaths: [IndexPath] = []
             
             for molecule in tmpMolecules {
@@ -207,6 +205,16 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
         }
     }
     
+    open override func addMolecules(_ molecules: [[AnyHashable: Any]], sender: UITableViewCell, animation: UITableView.RowAnimation) {
+        
+        DispatchQueue.main.async { [weak self] in
+            guard let indexPath = self?.tableView?.indexPath(for: sender) else { return }
+            DispatchQueue.global().async {
+                self?.addMolecules(molecules, indexPath: indexPath, animation: animation)
+            }
+        }
+    }
+    
     open override func removeMolecules(_ molecules: [[AnyHashable: Any]], sender: UITableViewCell, animation: UITableView.RowAnimation) {
         
         var tmpMolecules = [ListItemModelProtocol & MoleculeModelProtocol]()