diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldScriptEngine.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldScriptEngine.java
index 212d971398..779f52c5d6 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldScriptEngine.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldScriptEngine.java
@@ -21,9 +21,9 @@ import java.util.Map;
 
 public interface CalculatedFieldScriptEngine {
 
-    ListenableFuture<Object> executeScriptAsync(Map<String, ArgumentEntry> arguments);
+    ListenableFuture<Object> executeScriptAsync(Object[] args);
 
-    ListenableFuture<Map<String, Object>> executeToMapAsync(Map<String, ArgumentEntry> arguments);
+    ListenableFuture<Map<String, Object>> executeToMapAsync(Object[] args);
 
     ListenableFuture<Map<String, Object>> executeToMapTransform(Object result);
 
diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldTbelScriptEngine.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldTbelScriptEngine.java
index 363eefd44e..7ac032573f 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldTbelScriptEngine.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldTbelScriptEngine.java
@@ -19,11 +19,9 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.script.api.ScriptType;
 import org.thingsboard.script.api.tbel.TbelInvokeService;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.kv.KvEntry;
 
 import javax.script.ScriptException;
 import java.util.Map;
@@ -53,9 +51,8 @@ public class CalculatedFieldTbelScriptEngine implements CalculatedFieldScriptEng
     }
 
     @Override
-    public ListenableFuture<Object> executeScriptAsync(Map<String, ArgumentEntry> arguments) {
-        log.trace("execute script async, arguments {}", arguments);
-        Object[] args = arguments.values().stream().map(ArgumentEntry::getValue).toArray();
+    public ListenableFuture<Object> executeScriptAsync(Object[] args) {
+        log.trace("Executing script async, args {}", args);
         return Futures.transformAsync(tbelInvokeService.invokeScript(tenantId, null, this.scriptId, args),
                 o -> {
                     try {
@@ -73,8 +70,8 @@ public class CalculatedFieldTbelScriptEngine implements CalculatedFieldScriptEng
     }
 
     @Override
-    public ListenableFuture<Map<String, Object>> executeToMapAsync(Map<String, ArgumentEntry> arguments) {
-        return Futures.transformAsync(executeScriptAsync(arguments), this::executeToMapTransform, MoreExecutors.directExecutor());
+    public ListenableFuture<Map<String, Object>> executeToMapAsync(Object[] args) {
+        return Futures.transformAsync(executeScriptAsync(args), this::executeToMapTransform, MoreExecutors.directExecutor());
     }
 
     @Override
diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java
index 16905930d3..99befa6e65 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java
@@ -39,7 +39,8 @@ public class ScriptCalculatedFieldState extends BaseCalculatedFieldState {
     public ListenableFuture<CalculatedFieldResult> performCalculation(CalculatedFieldCtx ctx) {
         Output output = ctx.getOutput();
         if (isValid(ctx.getArguments())) {
-            ListenableFuture<Map<String, Object>> resultFuture = ctx.getCalculatedFieldScriptEngine().executeToMapAsync(this.arguments);
+            Object[] args = arguments.values().stream().map(ArgumentEntry::getValue).toArray();
+            ListenableFuture<Map<String, Object>> resultFuture = ctx.getCalculatedFieldScriptEngine().executeToMapAsync(args);
             return Futures.transform(resultFuture,
                     result -> new CalculatedFieldResult(output.getType(), output.getScope(), result),
                     MoreExecutors.directExecutor()