diff --git a/src/main/java/com/redislabs/redisai/Command.java b/src/main/java/com/redislabs/redisai/Command.java
index f12e3e7..9180b02 100644
--- a/src/main/java/com/redislabs/redisai/Command.java
+++ b/src/main/java/com/redislabs/redisai/Command.java
@@ -13,9 +13,11 @@ public enum Command implements ProtocolCommand {
   MODEL_RUN("AI.MODELRUN"),
   MODEL_EXECUTE("AI.MODELEXECUTE"),
   SCRIPT_SET("AI.SCRIPTSET"),
+  SCRIPT_STORE("AI.SCRIPTSTORE"),
   SCRIPT_GET("AI.SCRIPTGET"),
   SCRIPT_DEL("AI.SCRIPTDEL"),
   SCRIPT_RUN("AI.SCRIPTRUN"),
+  SCRIPT_EXECUTE("AI.SCRIPTEXECUTE"),
   DAGRUN("AI.DAGRUN"),
   DAGRUN_RO("AI.DAGRUN_RO"),
   DAGEXECUTE("AI.DAGEXECUTE"),
diff --git a/src/main/java/com/redislabs/redisai/Dag.java b/src/main/java/com/redislabs/redisai/Dag.java
index 5cca32a..4c41587 100644
--- a/src/main/java/com/redislabs/redisai/Dag.java
+++ b/src/main/java/com/redislabs/redisai/Dag.java
@@ -68,6 +68,21 @@ public Dag runScript(String key, String function, String[] inputs, String[] outp
     return this;
   }
 
+  @Override
+  public Dag executeScript(
+      String key,
+      String function,
+      List<String> keys,
+      List<String> inputs,
+      List<String> args,
+      List<String> outputs) {
+    List<byte[]> binary =
+        Script.scriptExecuteFlatArgs(key, function, keys, inputs, args, outputs, -1L, true);
+    this.commands.add(binary);
+    this.tensorgetflag.add(false);
+    return this;
+  }
+
   List<byte[]> dagRunFlatArgs(String[] loadKeys, String[] persistKeys) {
     List<byte[]> args = new ArrayList<>();
     if (loadKeys != null && loadKeys.length > 0) {
diff --git a/src/main/java/com/redislabs/redisai/DagRunCommands.java b/src/main/java/com/redislabs/redisai/DagRunCommands.java
index 328eed8..a4bfb0a 100644
--- a/src/main/java/com/redislabs/redisai/DagRunCommands.java
+++ b/src/main/java/com/redislabs/redisai/DagRunCommands.java
@@ -1,5 +1,7 @@
 package com.redislabs.redisai;
 
+import java.util.List;
+
 interface DagRunCommands<T> {
   T setTensor(String key, Tensor tensor);
 
@@ -10,4 +12,12 @@ interface DagRunCommands<T> {
   T executeModel(String key, String[] inputs, String[] outputs);
 
   T runScript(String key, String function, String[] inputs, String[] outputs);
+
+  T executeScript(
+      String key,
+      String function,
+      List<String> keys,
+      List<String> inputs,
+      List<String> args,
+      List<String> outputs);
 }
diff --git a/src/main/java/com/redislabs/redisai/Device.java b/src/main/java/com/redislabs/redisai/Device.java
index aebb77c..2d3b895 100644
--- a/src/main/java/com/redislabs/redisai/Device.java
+++ b/src/main/java/com/redislabs/redisai/Device.java
@@ -10,9 +10,10 @@ public enum Device implements ProtocolCommand {
   private final byte[] raw;
 
   Device() {
-    raw = SafeEncoder.encode(this.name());
+    raw = SafeEncoder.encode(name());
   }
 
+  @Override
   public byte[] getRaw() {
     return raw;
   }
diff --git a/src/main/java/com/redislabs/redisai/Keyword.java b/src/main/java/com/redislabs/redisai/Keyword.java
index 25d69d8..bcd7b3f 100644
--- a/src/main/java/com/redislabs/redisai/Keyword.java
+++ b/src/main/java/com/redislabs/redisai/Keyword.java
@@ -12,6 +12,7 @@ public enum Keyword implements ProtocolCommand {
   SOURCE,
   RESETSTAT,
   TAG,
+  ENTRY_POINTS,
   BATCHSIZE,
   MINBATCHSIZE,
   MINBATCHTIMEOUT,
@@ -21,6 +22,7 @@ public enum Keyword implements ProtocolCommand {
   LOAD,
   PERSIST,
   KEYS,
+  ARGS,
   PIPE("|>");
 
   private final byte[] raw;
diff --git a/src/main/java/com/redislabs/redisai/RedisAI.java b/src/main/java/com/redislabs/redisai/RedisAI.java
index 95a46c0..2701b4e 100644
--- a/src/main/java/com/redislabs/redisai/RedisAI.java
+++ b/src/main/java/com/redislabs/redisai/RedisAI.java
@@ -9,6 +9,7 @@
 import java.util.Map;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import redis.clients.jedis.BinaryClient;
+import redis.clients.jedis.Client;
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisClientConfig;
@@ -103,6 +104,22 @@ private static JedisPoolConfig initPoolConfig(int poolSize) {
     return conf;
   }
 
+  private Jedis getConnection() {
+    return pool.getResource();
+  }
+
+  private BinaryClient sendCommand(Jedis conn, Command command, byte[]... args) {
+    BinaryClient client = conn.getClient();
+    client.sendCommand(command, args);
+    return client;
+  }
+
+  private Client sendCommand(Jedis conn, Command command, String... args) {
+    Client client = conn.getClient();
+    client.sendCommand(command, args);
+    return client;
+  }
+
   /**
    * Direct mapping to AI.TENSORSET
    *
@@ -320,6 +337,27 @@ public boolean setScript(String key, Script script) {
     }
   }
 
+  /**
+   * Direct mapping to AI.MODELSTORE command.
+   *
+   * <p>{@code AI.SCRIPTSTORE <key> <device> [TAG tag] ENTRY_POINTS <entry_point_count>
+   * <entry_point> [<entry_point>...] SOURCE "<script>"}
+   *
+   * @param key name of key to store the Script in RedisAI server
+   * @param script the Script Object
+   * @return true if Script was properly stored in RedisAI server
+   */
+  public boolean storeScript(String key, Script script) {
+    try (Jedis conn = getConnection()) {
+      List<String> args = script.getScriptStoreCommandBytes(key);
+      return sendCommand(conn, Command.SCRIPT_STORE, args.toArray(new String[args.size()]))
+          .getStatusCodeReply()
+          .equals("OK");
+    } catch (JedisDataException ex) {
+      throw new RedisAIException(ex.getMessage(), ex);
+    }
+  }
+
   /**
    * Direct mapping to AI.SCRIPTGET
    *
@@ -427,6 +465,50 @@ public boolean runScript(String key, String function, String[] inputs, String[]
     }
   }
 
+  public boolean executeScript(
+      String key,
+      String function,
+      List<String> keys,
+      List<String> inputs,
+      List<String> args,
+      List<String> outputs) {
+    return executeScript(key, function, keys, inputs, args, outputs, -1);
+  }
+
+  /**
+   * Direct mapping to AI.SCRIPTEXECUTE command.
+   *
+   * <p>{@code AI.SCRIPTEXECUTE <key> <function> [KEYS n <key> [keys...]] [INPUTS m <input> [input
+   * ...]] [ARGS k <arg> [arg...]] [OUTPUTS k <output> [output ...] [TIMEOUT t]]+}
+   *
+   * @param key
+   * @param function
+   * @param keys
+   * @param inputs
+   * @param args
+   * @param outputs
+   * @param timeout timeout in ms
+   * @return
+   */
+  public boolean executeScript(
+      String key,
+      String function,
+      List<String> keys,
+      List<String> inputs,
+      List<String> args,
+      List<String> outputs,
+      long timeout) {
+    try (Jedis conn = getConnection()) {
+      List<byte[]> binary =
+          Script.scriptExecuteFlatArgs(key, function, keys, inputs, args, outputs, timeout, false);
+      return sendCommand(conn, Command.SCRIPT_EXECUTE, binary.toArray(new byte[binary.size()][]))
+          .getStatusCodeReply()
+          .equals("OK");
+    } catch (JedisDataException ex) {
+      throw new RedisAIException(ex.getMessage(), ex);
+    }
+  }
+
   /**
    * Direct mapping to AI.DAGRUN specifies a direct acyclic graph of operations to run within
    * RedisAI
@@ -555,16 +637,6 @@ public boolean resetStat(String key) {
     }
   }
 
-  private Jedis getConnection() {
-    return pool.getResource();
-  }
-
-  private BinaryClient sendCommand(Jedis conn, Command command, byte[]... args) {
-    BinaryClient client = conn.getClient();
-    client.sendCommand(command, args);
-    return client;
-  }
-
   /**
    * AI.CONFIG <BACKENDSPATH <path>>
    *
diff --git a/src/main/java/com/redislabs/redisai/Script.java b/src/main/java/com/redislabs/redisai/Script.java
index 18b9e6a..c1eda68 100644
--- a/src/main/java/com/redislabs/redisai/Script.java
+++ b/src/main/java/com/redislabs/redisai/Script.java
@@ -7,17 +7,20 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import redis.clients.jedis.BuilderFactory;
+import redis.clients.jedis.Protocol;
 import redis.clients.jedis.util.SafeEncoder;
 
 public class Script {
 
   /** the device that will execute the model. can be of CPU or GPU */
-  private Device device;
+  private Device device; // TODO: final
 
   /** a string containing TorchScript source code */
-  private String source;
+  private String source; // TODO: final
 
   /**
    * tag is an optional string for tagging the model such as a version number or any arbitrary
@@ -25,11 +28,12 @@ public class Script {
    */
   private String tag;
 
+  private List<String> entryPoints;
+
   /** @param device the device that will execute the model. can be of CPU or GPU */
+  @Deprecated
   public Script(Device device) {
-    this.device = device;
-    this.source = "";
-    this.tag = null;
+    this(device, "");
   }
 
   /**
@@ -37,7 +41,7 @@ public Script(Device device) {
    * @param source a string containing TorchScript source code
    */
   public Script(Device device, String source) {
-    this(device);
+    this.device = device;
     this.source = source;
   }
 
@@ -46,56 +50,55 @@ public Script(Device device, String source) {
    *
    * @param device the device that will execute the model. can be of CPU or GPU
    * @param filePath file path to load the script from
+   * @throws java.io.IOException
    */
   public Script(Device device, Path filePath) throws IOException {
-    this(device);
-    this.source =
-        Files.readAllLines(filePath, StandardCharsets.UTF_8).stream()
-                .collect(Collectors.joining("\n"))
-            + "\n";
+    this(device, fileContent(filePath));
+  }
+
+  private static String fileContent(Path filePath) throws IOException {
+    return Files.readAllLines(filePath, StandardCharsets.UTF_8).stream()
+            .collect(Collectors.joining("\n"))
+        + "\n";
   }
 
   public static Script createScriptFromRespReply(List<?> reply) {
-    Script script = null;
-    String source = null;
     Device device = null;
     String tag = null;
+    String source = null;
+    List<String> entryPoints = null;
     for (int i = 0; i < reply.size(); i += 2) {
-      String arrayKey = SafeEncoder.encode((byte[]) reply.get(i));
-      switch (arrayKey) {
+      String mapKey = SafeEncoder.encode((byte[]) reply.get(i));
+      Object mapVal = reply.get(i + 1);
+      switch (mapKey) {
         case "source":
-          source = SafeEncoder.encode((byte[]) reply.get(i + 1));
+          source = BuilderFactory.STRING.build(mapVal);
           break;
         case "device":
-          String deviceString = SafeEncoder.encode((byte[]) reply.get(i + 1));
-          device = Device.valueOf(deviceString);
-          if (device == null) {
-            throw new JRedisAIRunTimeException("Unrecognized device: " + deviceString);
-          }
+          device = Device.valueOf(BuilderFactory.STRING.build(mapVal));
           break;
         case "tag":
-          tag = SafeEncoder.encode((byte[]) reply.get(i + 1));
+          tag = BuilderFactory.STRING.build(mapVal);
+          break;
+        case "Entry Points":
+          entryPoints = BuilderFactory.STRING_LIST.build(mapVal);
           break;
         default:
           break;
       }
     }
     if (device != null && source != null) {
-      script = new Script(device, source);
-      if (tag != null) {
-        script.setTag(tag);
-      }
-    } else {
-      throw new JRedisAIRunTimeException(
-          "AI.SCRIPTGET reply did not contained all elements to build the script");
+      return new Script(device, source).setTag(tag).setEntryPoints(entryPoints);
     }
-    return script;
+    throw new JRedisAIRunTimeException(
+        "AI.SCRIPTGET reply did not contained all elements to build the script");
   }
 
   public Device getDevice() {
     return device;
   }
 
+  @Deprecated
   public void setDevice(Device device) {
     this.device = device;
   }
@@ -104,6 +107,7 @@ public String getSource() {
     return source;
   }
 
+  @Deprecated
   public void setSource(String source) {
     this.source = source;
   }
@@ -112,8 +116,22 @@ public String getTag() {
     return tag;
   }
 
-  public void setTag(String tag) {
+  public Script setTag(String tag) {
     this.tag = tag;
+    return this;
+  }
+
+  public List<String> getEntryPoints() {
+    return entryPoints;
+  }
+
+  public Script setEntryPoints(List<String> entryPoints) {
+    this.entryPoints = entryPoints;
+    return this;
+  }
+
+  public Script setEntryPoints(String... entryPoints) {
+    return setEntryPoints(Arrays.asList(entryPoints));
   }
 
   /**
@@ -135,17 +153,40 @@ protected List<byte[]> getScriptSetCommandBytes(String key) {
     return args;
   }
 
+  /**
+   * Prepare AI.SCRIPTSTORE command arguments
+   *
+   * @param key name of key to store the Script
+   * @return
+   */
+  protected List<String> getScriptStoreCommandBytes(String key) {
+    List<String> args = new ArrayList<>();
+    args.add(key);
+    args.add(device.name());
+    if (tag != null) {
+      args.add(Keyword.TAG.name());
+      args.add(tag);
+    }
+    if (entryPoints != null && !entryPoints.isEmpty()) {
+      args.add(Keyword.ENTRY_POINTS.name());
+      args.add(Integer.toString(entryPoints.size()));
+      args.addAll(entryPoints);
+    }
+    args.add(Keyword.SOURCE.name());
+    args.add(source);
+    return args;
+  }
+
   /**
    * sets the Script source give a filePath
    *
    * @param filePath
    * @throws IOException
+   * @deprecated Use {@link #Script(com.redislabs.redisai.Device, java.nio.file.Path)}.
    */
+  @Deprecated
   public void readSourceFromFile(String filePath) throws IOException {
-    this.source =
-        Files.readAllLines(Paths.get(filePath), StandardCharsets.UTF_8).stream()
-                .collect(Collectors.joining("\n"))
-            + "\n";
+    this.source = fileContent(Paths.get(filePath));
   }
 
   protected static List<byte[]> scriptRunFlatArgs(
@@ -167,4 +208,40 @@ protected static List<byte[]> scriptRunFlatArgs(
     }
     return args;
   }
+
+  protected static List<byte[]> scriptExecuteFlatArgs(
+      String key,
+      String function,
+      List<String> keys,
+      List<String> inputs,
+      List<String> args,
+      List<String> outputs,
+      long timeout,
+      boolean includeCommandName) {
+    List<byte[]> binary = new ArrayList<>();
+    if (includeCommandName) {
+      binary.add(Command.SCRIPT_EXECUTE.getRaw());
+    }
+
+    binary.add(SafeEncoder.encode(key));
+    binary.add(SafeEncoder.encode(function));
+    variadicArgumentsCheckAndAddWithCount(binary, Keyword.KEYS, keys);
+    variadicArgumentsCheckAndAddWithCount(binary, Keyword.INPUTS, inputs);
+    variadicArgumentsCheckAndAddWithCount(binary, Keyword.ARGS, args);
+    variadicArgumentsCheckAndAddWithCount(binary, Keyword.OUTPUTS, outputs);
+    if (timeout >= 0) {
+      binary.add(Keyword.TIMEOUT.getRaw());
+      binary.add(Protocol.toByteArray(timeout));
+    }
+
+    return binary;
+  }
+
+  private static void variadicArgumentsCheckAndAddWithCount(
+      List<byte[]> arguments, Keyword keyword, List<String> values) {
+    if (values == null || values.isEmpty()) return;
+    arguments.add(keyword.getRaw());
+    arguments.add(Protocol.toByteArray(values.size()));
+    values.forEach(v -> arguments.add(SafeEncoder.encode(v)));
+  }
 }
diff --git a/src/test/java/com/redislabs/redisai/RedisAITest.java b/src/test/java/com/redislabs/redisai/RedisAITest.java
index c3f9b18..e1d5794 100644
--- a/src/test/java/com/redislabs/redisai/RedisAITest.java
+++ b/src/test/java/com/redislabs/redisai/RedisAITest.java
@@ -3,8 +3,10 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.Map;
 import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
@@ -432,6 +434,12 @@ public void testSetScriptNegative() {
     }
   }
 
+  @Test(expected = RedisAIException.class)
+  public void storeScriptNegative() {
+    Script script = new Script(Device.CPU, "def fun () :\n");
+    client.storeScript("negative", script);
+  }
+
   @Test
   public void testRunScript() {
     ClassLoader classLoader = getClass().getClassLoader();
@@ -457,6 +465,48 @@ public void testRunScriptNegative() {
     }
   }
 
+  @Test
+  public void storeExecuteScript() throws IOException {
+    String scriptStr =
+        IOUtils.resourceToString(
+            "test_data/script_v2.txt", StandardCharsets.US_ASCII, getClass().getClassLoader());
+    Script script = new Script(Device.CPU, scriptStr).setEntryPoints("bar", "bar_variadic");
+    client.storeScript("script", script);
+
+    Script response = client.getScript("script");
+    Assert.assertEquals(Device.CPU, script.getDevice());
+    Assert.assertEquals(scriptStr, response.getSource());
+    Assert.assertEquals("", response.getTag());
+    Assert.assertEquals(Arrays.asList("bar", "bar_variadic"), response.getEntryPoints());
+
+    client.setTensor("a{1}", new float[][] {{2, 3}, {2, 3}}, new int[] {2, 2});
+    client.setTensor("b{1}", new float[][] {{2, 3}, {2, 3}}, new int[] {2, 2});
+
+    Assert.assertTrue(
+        client.executeScript(
+            "script",
+            "bar",
+            Arrays.asList("{1}"),
+            Arrays.asList("a{1}", "b{1}"),
+            null,
+            Arrays.asList("c{1}")));
+
+    Tensor tensor = client.getTensor("c{1}");
+    Assert.assertArrayEquals(new float[] {4, 6, 4, 6}, (float[]) tensor.getValues(), 0f);
+
+    Assert.assertTrue(
+        client.executeScript(
+            "script",
+            "bar_variadic",
+            Arrays.asList("{1}"),
+            Arrays.asList("a{1}", "b{1}"),
+            null,
+            Arrays.asList("d{1}")));
+
+    Tensor tensor2 = client.getTensor("d{1}");
+    Assert.assertArrayEquals(new float[] {4, 6, 4, 6}, (float[]) tensor2.getValues(), 0f);
+  }
+
   @Test
   public void testGetTensor() {
     Assert.assertTrue(client.setTensor("t1", new float[][] {{1, 2}, {3, 4}}, new int[] {2, 2}));
@@ -464,7 +514,7 @@ public void testGetTensor() {
     float[] values = (float[]) tensor.getValues();
     Assert.assertEquals("Assert same shape of values", 4, values.length);
     float[] expected = new float[] {1, 2, 3, 4};
-    Assert.assertArrayEquals(values, expected, (float) 0.1);
+    Assert.assertArrayEquals(expected, values, (float) 0.1);
   }
 
   @Test
diff --git a/src/test/java/com/redislabs/redisai/ScriptTest.java b/src/test/java/com/redislabs/redisai/ScriptTest.java
index a7c8e10..07bd83e 100644
--- a/src/test/java/com/redislabs/redisai/ScriptTest.java
+++ b/src/test/java/com/redislabs/redisai/ScriptTest.java
@@ -6,6 +6,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.junit.Assert;
@@ -101,4 +102,10 @@ public void createScriptFromRespReply() {
           "AI.SCRIPTGET reply did not contained all elements to build the script", e.getMessage());
     }
   }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void invalidDevice() {
+    Script.createScriptFromRespReply(
+        Arrays.asList("device".getBytes(), "".getBytes(), "script".getBytes(), "".getBytes()));
+  }
 }
diff --git a/src/test/resources/test_data/script_v2.txt b/src/test/resources/test_data/script_v2.txt
new file mode 100644
index 0000000..4478acc
--- /dev/null
+++ b/src/test/resources/test_data/script_v2.txt
@@ -0,0 +1,9 @@
+def bar(tensors: List[Tensor], keys: List[str], args: List[str]):
+    a = tensors[0]
+    b = tensors[1]
+    return a + b
+
+def bar_variadic(tensors: List[Tensor], keys: List[str], args: List[str]):
+    a = tensors[0]
+    l = tensors[1:]
+    return a + l[0]