diff --git a/libnymea-core/scriptengine/scriptaction.cpp b/libnymea-core/scriptengine/scriptaction.cpp
index 0af1a4ad..c089757d 100644
--- a/libnymea-core/scriptengine/scriptaction.cpp
+++ b/libnymea-core/scriptengine/scriptaction.cpp
@@ -84,27 +84,39 @@ void ScriptAction::setActionName(const QString &actionName)
     }
 }
 
-void ScriptAction::execute(const QVariantList &params)
+void ScriptAction::execute(const QVariantMap &params)
 {
     Device *device = m_deviceManager->configuredDevices().findById(DeviceId(m_deviceId));
     if (!device) {
         qCWarning(dcScriptEngine) << "No device with id" << m_deviceId;
         return;
     }
-    ActionTypeId actionTypeId = ActionTypeId(m_actionTypeId);
-    if (actionTypeId.isNull()) {
-        actionTypeId = device->deviceClass().actionTypes().findByName(m_actionName).id();
+    ActionType actionType;
+    if (!ActionTypeId(m_actionTypeId).isNull()) {
+        actionType = device->deviceClass().actionTypes().findById(ActionTypeId(m_actionTypeId));
+    } else {
+        actionType = device->deviceClass().actionTypes().findByName(m_actionName);
     }
-    if (actionTypeId.isNull()) {
+    if (actionType.id().isNull()) {
         qCWarning(dcScriptEngine()) << "Either a valid actionTypeId or actionName is required";
         return;
     }
     Action action;
-    action.setActionTypeId(actionTypeId);
+    action.setActionTypeId(actionType.id());
     action.setDeviceId(DeviceId(m_deviceId));
     ParamList paramList;
-    foreach (const QVariant &p, params) {
-        paramList << Param(ParamTypeId(p.toMap().value("paramTypeId").toUuid()), p.toMap().value("value"));
+    foreach (const QString &paramNameOrId, params.keys()) {
+        ParamType paramType;
+        if (!ParamTypeId(paramNameOrId).isNull()) {
+            paramType = actionType.paramTypes().findById(ParamTypeId(paramNameOrId));
+        } else {
+            paramType = actionType.paramTypes().findByName(paramNameOrId);
+        }
+        if (paramType.id().isNull()) {
+            qCWarning(dcScriptEngine()) << "Invalid param id or name";
+            continue;
+        }
+        paramList << Param(paramType.id(), params.value(paramNameOrId));
     }
     action.setParams(paramList);
     m_deviceManager->executeAction(action);
diff --git a/libnymea-core/scriptengine/scriptaction.h b/libnymea-core/scriptengine/scriptaction.h
index ea3bccb9..1f52b4b8 100644
--- a/libnymea-core/scriptengine/scriptaction.h
+++ b/libnymea-core/scriptengine/scriptaction.h
@@ -49,7 +49,7 @@ public:
     void setActionName(const QString &actionName);
 
 public slots:
-    void execute(const QVariantList &params);
+    void execute(const QVariantMap &params);
 
 signals:
     void deviceIdChanged();
diff --git a/libnymea-core/scriptengine/scriptevent.cpp b/libnymea-core/scriptengine/scriptevent.cpp
index bf9279a2..7dd00375 100644
--- a/libnymea-core/scriptengine/scriptevent.cpp
+++ b/libnymea-core/scriptengine/scriptevent.cpp
@@ -94,7 +94,16 @@ void ScriptEvent::onEventTriggered(const Event &event)
         return;
     }
 
-    emit triggered();
+//    ScriptParams *params = new ScriptParams(event.params());
+//    qmlEngine(this)->setObjectOwnership(params, QQmlEngine::JavaScriptOwnership);
+    QVariantMap params;
+    foreach (const Param &param, event.params()) {
+        params.insert(param.paramTypeId().toString().remove(QRegExp("[{}]")), param.value());
+        QString paramName = device->deviceClass().eventTypes().findById(event.eventTypeId()).paramTypes().findById(param.paramTypeId()).name();
+        params.insert(paramName, param.value());
+    }
+
+    emit triggered(params);
 }
 
 }
diff --git a/libnymea-core/scriptengine/scriptevent.h b/libnymea-core/scriptengine/scriptevent.h
index cb2d71cd..21aa7eb9 100644
--- a/libnymea-core/scriptengine/scriptevent.h
+++ b/libnymea-core/scriptengine/scriptevent.h
@@ -30,6 +30,8 @@
 
 namespace nymeaserver {
 
+class ScriptParams;
+
 class ScriptEvent: public QObject, public QQmlParserStatus
 {
     Q_OBJECT
@@ -59,7 +61,8 @@ signals:
     void eventTypeIdChanged();
     void eventNameChanged();
 
-    void triggered();
+//    void triggered(ScriptParams *params);
+    void triggered(const QVariantMap &params);
 
 private:
     DeviceManager *m_deviceManager = nullptr;