diff --git a/MVMCoreUI/BaseClasses/BarButtonItem.swift b/MVMCoreUI/BaseClasses/BarButtonItem.swift
index cbb6ba2d..93eb63a3 100644
--- a/MVMCoreUI/BaseClasses/BarButtonItem.swift
+++ b/MVMCoreUI/BaseClasses/BarButtonItem.swift
@@ -31,11 +31,7 @@ public typealias BarButtonAction = (BarButtonItem) -> ()
     open func set(with actionModel: ActionModelProtocol, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         buttonDelegate = delegateObject?.buttonDelegate
         actionDelegate?.buttonAction = { sender in
-            if let data = try? actionModel.encode(using: JSONEncoder()),
-                let actionMap = try? JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions.init()) as? [AnyHashable: Any],
-                delegateObject?.buttonDelegate?.button?(sender, shouldPerformActionWithMap: actionMap, additionalData: additionalData) ?? true {
-                MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
-            }
+            Button.performButtonAction(with: actionModel, button: sender, delegateObject: delegateObject, additionalData: additionalData)
         }
     }