diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index 919703b3..7aca8f01 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -391,13 +391,11 @@ open class ViewController: UIViewController, MVMCoreViewControllerProtocol, MVMC
         return nil
     }
     
-    // Test to see if needed.
+    // Needed otherwise when subclassed, the extension gets called.
     open func moleculeLayoutUpdated(_ molecule: UIView & MVMCoreUIMoleculeViewProtocol) {}
-    open func addMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation) {}
-    open func removeMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation) {}
-    open func addMolecules(_ molecules: [[AnyHashable: Any]], indexPath: IndexPath, animation: UITableView.RowAnimation) {}
-    open func addMolecules(_ molecules: [[AnyHashable: Any]], sender: UITableViewCell, animation: UITableView.RowAnimation) {}
-    open func removeMolecules(_ molecules: [[AnyHashable: Any]], sender: UITableViewCell, animation: UITableView.RowAnimation) {}
+    open func getIndexPath(for molecule: ListItemModelProtocol & MoleculeModelProtocol) -> IndexPath? { return nil }
+    open func addMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], indexPath: IndexPath, animation: UITableView.RowAnimation) {}
+    open func removeMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], animation: UITableView.RowAnimation) {}
     
     // MARK: - UITextFieldDelegate (Check if this is still needed)
     // To Remove TextFields Bug: Keyboard is not dismissing after reaching textfield max length limit
diff --git a/MVMCoreUI/Molecules/Items/AccordionMoleculeTableViewCell.swift b/MVMCoreUI/Molecules/Items/AccordionMoleculeTableViewCell.swift
index 714c7dd9..a7970861 100644
--- a/MVMCoreUI/Molecules/Items/AccordionMoleculeTableViewCell.swift
+++ b/MVMCoreUI/Molecules/Items/AccordionMoleculeTableViewCell.swift
@@ -32,18 +32,14 @@ import UIKit
     override public func didSelectCell(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
         accordionButton.isSelected = !accordionButton.isSelected
         accordionButton.setTitle(accordionButton.isSelected ? "-" : "+", for: .normal)
-        guard let model = accordionListItemModel else {
-            return
-        }
-        
-        guard let json = model.toJSON(),
-            let molecules = json.optionalArrayForKey("molecules") as? [[AnyHashable: Any]]
-            else { return }
+        guard let model = accordionListItemModel else { return }
 
         if accordionButton.isSelected {
-            delegateObject?.moleculeDelegate?.addMolecules(molecules, sender: self, animation: .automatic)
+            if let indexPath = delegateObject?.moleculeDelegate?.getIndexPath(for: model) {
+                delegateObject?.moleculeDelegate?.addMolecules(model.molecules, indexPath: indexPath, animation: .automatic)
+            }
         } else {
-            delegateObject?.moleculeDelegate?.removeMolecules(molecules, sender: self, animation: .automatic)
+            delegateObject?.moleculeDelegate?.removeMolecules(model.molecules, animation: .automatic)
         }
         
         if (accordionListItemModel?.hideLineWhenExpanded ?? false) && (self.bottomSeparatorView?.shouldBeVisible() ?? false) {
diff --git a/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift b/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
index 0661e3ed..aa581ba1 100644
--- a/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
+++ b/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
@@ -29,14 +29,16 @@ import UIKit
             guard newValue != oldValue,
                 let self = self,
                 let index = self.dropDown.pickerData.firstIndex(of: newValue),
-                let molecules2D = (self.listItemModel as? DropDownListItemModel)?.molecules
+                let model = self.listItemModel as? DropDownListItemModel
                 else { return }
 
             if self.previousIndex != NSNotFound {
-                self.delegateObject?.moleculeDelegate?.removeMolecules(molecules2D[self.previousIndex], sender: self, animation: .fade)
+                self.delegateObject?.moleculeDelegate?.removeMolecules(model.molecules[self.previousIndex], animation: .fade)
             }
             
-            self.delegateObject?.moleculeDelegate?.addMolecules(molecules2D[index], sender: self, animation: .fade)
+            if let indexPath = self.delegateObject?.moleculeDelegate?.getIndexPath(for: model) {
+                self.delegateObject?.moleculeDelegate?.addMolecules(model.molecules[index], indexPath: indexPath, animation: .fade)
+            }
             self.previousIndex = index
         }
     }
diff --git a/MVMCoreUI/Molecules/Items/TabsTableViewCell.swift b/MVMCoreUI/Molecules/Items/TabsTableViewCell.swift
index da700a28..cb6ee755 100644
--- a/MVMCoreUI/Molecules/Items/TabsTableViewCell.swift
+++ b/MVMCoreUI/Molecules/Items/TabsTableViewCell.swift
@@ -54,23 +54,19 @@ import UIKit
 
 extension TabsTableViewCell: TopTabbarDelegate {
     public func shouldSelectItem(at index: Int, topTabbar: TopTabbar) -> Bool {
-        if let model = tabsListItemModel,
-            let json = model.toJSON(),
-            let json2d = json.optionalArrayForKey("molecules") as? [[[AnyHashable: Any]]] {
-            let molecules = json2d[topTabbar.selectedIndex]
-            delegateObject?.moleculeDelegate?.removeMolecules(molecules, sender: self, animation: index < tabs.selectedIndex ? .right : .left)
+        if let model = tabsListItemModel {
+            let molecules = model.molecules[topTabbar.selectedIndex]
+            delegateObject?.moleculeDelegate?.removeMolecules(molecules, animation: index < tabs.selectedIndex ? .right : .left)
         }
         previousTabIndex = tabs.selectedIndex
         return true
     }
 
     public func topTabbar(_ topTabbar: TopTabbar, didSelectItemAt index: Int) {
-        if let model = tabsListItemModel,
-        let json = model.toJSON(),
-            let json2d = json.optionalArrayForKey("molecules") as? [[[AnyHashable: Any]]] {
-            let molecules = json2d[index]
-            delegateObject?.moleculeDelegate?.addMolecules(molecules, sender: self, animation: index < previousTabIndex ? .left : .right)
-        }
+        guard let model = tabsListItemModel,
+            let indexPath = delegateObject?.moleculeDelegate?.getIndexPath(for: model) else { return }
+        let molecules = model.molecules[index]
+        delegateObject?.moleculeDelegate?.addMolecules(molecules, indexPath: indexPath, animation: index < previousTabIndex ? .left : .right)
     }
 }
 
diff --git a/MVMCoreUI/OtherHandlers/ModelMoleculeDelegateProtocol.swift b/MVMCoreUI/OtherHandlers/ModelMoleculeDelegateProtocol.swift
index eb175c3a..435e5a24 100644
--- a/MVMCoreUI/OtherHandlers/ModelMoleculeDelegateProtocol.swift
+++ b/MVMCoreUI/OtherHandlers/ModelMoleculeDelegateProtocol.swift
@@ -18,39 +18,16 @@ public protocol MoleculeDelegateProtocol {
     func moleculeLayoutUpdated(_ molecule: UIView & MVMCoreUIMoleculeViewProtocol) //optional
 
     /// 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
-    func addMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation)
-    func removeMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation)
+    func getIndexPath(for molecule: ListItemModelProtocol & MoleculeModelProtocol) -> IndexPath?
+    func addMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], indexPath: IndexPath, animation: UITableView.RowAnimation)
+    func removeMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], animation: UITableView.RowAnimation)
 }
 
 extension MoleculeDelegateProtocol {
-    public func moleculeLayoutUpdated(_ molecule: UIView & MVMCoreUIMoleculeViewProtocol) {
-        // Do Nothing
-    }
     
-    public func addMolecules(_ molecules: [[AnyHashable : Any]], sender: UITableViewCell, animation: UITableView.RowAnimation) {
-        // Do nothing
-    }
+    public func moleculeLayoutUpdated(_ molecule: UIView & MVMCoreUIMoleculeViewProtocol) {}
     
-    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
-    }
-    
-    public func addMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation) {
-        // Do nothing
-    }
-    
-    public func removeMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation) {
-        // Do nothing
-    }
+    public func getIndexPath(for molecule: ListItemModelProtocol & MoleculeModelProtocol) -> IndexPath? { return nil }
+    public func addMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], indexPath: IndexPath, animation: UITableView.RowAnimation) {}
+    public func removeMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], animation: UITableView.RowAnimation) {}
 }
diff --git a/MVMCoreUI/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Templates/MoleculeListTemplate.swift
index 8871db4d..ca56b4af 100644
--- a/MVMCoreUI/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Templates/MoleculeListTemplate.swift
@@ -158,77 +158,18 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
         }
     }
     
-    open override func addMolecules(_ molecules: [[AnyHashable: Any]], indexPath: IndexPath, animation: UITableView.RowAnimation) {
-        
-        var tmpMolecules = [ListItemModelProtocol & MoleculeModelProtocol]()
-        
-        molecules.forEach { molecule in
-            if let data = try? JSONSerialization.data(withJSONObject: molecule), let listItemModel = try? JSONDecoder().decode(MoleculeListItemModel.self, from: data) {
-                tmpMolecules.append(listItemModel)
-            }
-        }
-        
-        DispatchQueue.main.async {
-            var indexPaths: [IndexPath] = []
-            
-            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)
-                    indexPaths.append(IndexPath(row: index, section: 0))
-                }
-            }
-            
-            self.tableView?.insertRows(at: indexPaths, with: animation)
-            self.updateViewConstraints()
-            self.view.layoutIfNeeded()
-        }
+    open override func getIndexPath(for molecule: ListItemModelProtocol & MoleculeModelProtocol) -> IndexPath? {
+        guard let index = moleculesInfo?.firstIndex(where: { (moleculeInfo) -> Bool in
+            //TODO: cehck for molecule protocola eqality
+            let json = moleculeInfo.molecule.toJSON()
+            return json == molecule.toJSON()
+        }) else { return nil }
+        return IndexPath(row: index, section: 0)
     }
     
-    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]()
-        
-        molecules.forEach { molecule in
-            if let data = try? JSONSerialization.data(withJSONObject: molecule),
-                let listItemModel = try? JSONDecoder().decode(MoleculeListItemModel.self, from: data) {
-                tmpMolecules.append(listItemModel)
-            }
-        }
-        
-        var indexPaths: [IndexPath] = []
-        
-        //TODO: cehck for molecule protocola eqality
-        
-        for molecule in tmpMolecules {
-            if let removeIndex = moleculesInfo?.firstIndex(where: { molecule.toJSON() == $0.molecule.toJSON() }) {
-                
-                moleculesInfo?.remove(at: removeIndex)
-                indexPaths.append(IndexPath(row: removeIndex + indexPaths.count, section: 0))
-            }
-        }
-        
-        tableView?.deleteRows(at: indexPaths, with: animation)
-        updateViewConstraints()
-        view.layoutIfNeeded()
-    }
-    
-    open override func addMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation) {
-        
+    open override func addMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], indexPath: IndexPath, animation: UITableView.RowAnimation) {
         // This dispatch is needed to fix a race condition that can occur if this function is called during the table setup.
         DispatchQueue.main.async {
-            guard let indexPath = self.tableView?.indexPath(for: sender) else { return }
             var indexPaths: [IndexPath] = []
             
             for molecule in molecules {
@@ -246,8 +187,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
         }
     }
     
-    open override func removeMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], sender: UITableViewCell, animation: UITableView.RowAnimation) {
-        
+    open override func removeMolecules(_ molecules: [ListItemModelProtocol & MoleculeModelProtocol], animation: UITableView.RowAnimation) {
         var indexPaths: [IndexPath] = []
         //TODO: cehck for molecule protocola eqality