diff --git a/beacon/src/main/java/io/xpipe/beacon/BeaconClient.java b/beacon/src/main/java/io/xpipe/beacon/BeaconClient.java
index ebac921c9..a12f8f21d 100644
--- a/beacon/src/main/java/io/xpipe/beacon/BeaconClient.java
+++ b/beacon/src/main/java/io/xpipe/beacon/BeaconClient.java
@@ -18,6 +18,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.Socket;
+import java.net.SocketException;
 import java.util.Arrays;
 import java.util.Optional;
 
@@ -134,6 +135,8 @@ public class BeaconClient implements AutoCloseable {
         try {
             var in = socket.getInputStream();
             read = JacksonHelper.newMapper().disable(JsonParser.Feature.AUTO_CLOSE_SOURCE).readTree(in);
+        } catch (SocketException ex) {
+            throw new ConnectorException("Connection to xpipe daemon closed unexpectedly");
         } catch (IOException ex) {
             throw new ConnectorException("Couldn't read from socket", ex);
         }
diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/PreStoreExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/PreStoreExchange.java
new file mode 100644
index 000000000..6a4d43716
--- /dev/null
+++ b/beacon/src/main/java/io/xpipe/beacon/exchange/PreStoreExchange.java
@@ -0,0 +1,41 @@
+package io.xpipe.beacon.exchange;
+
+import io.xpipe.beacon.message.RequestMessage;
+import io.xpipe.beacon.message.ResponseMessage;
+import io.xpipe.core.store.LocalFileDataStore;
+import lombok.Builder;
+import lombok.Value;
+import lombok.extern.jackson.Jacksonized;
+
+import java.nio.file.Path;
+
+public class PreStoreExchange implements MessageExchange<PreStoreExchange.Request, PreStoreExchange.Response> {
+
+    @Override
+    public String getId() {
+        return "preStore";
+    }
+
+    @Override
+    public Class<PreStoreExchange.Request> getRequestClass() {
+        return PreStoreExchange.Request.class;
+    }
+
+    @Override
+    public Class<PreStoreExchange.Response> getResponseClass() {
+        return PreStoreExchange.Response.class;
+    }
+
+    @Jacksonized
+    @Builder
+    @Value
+    public static class Request implements RequestMessage {
+    }
+
+    @Jacksonized
+    @Builder
+    @Value
+    public static class Response implements ResponseMessage {
+        LocalFileDataStore store;
+    }
+}
diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/ReadPreparationExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/ReadPreparationExchange.java
index 4390125eb..52eb59e14 100644
--- a/beacon/src/main/java/io/xpipe/beacon/exchange/ReadPreparationExchange.java
+++ b/beacon/src/main/java/io/xpipe/beacon/exchange/ReadPreparationExchange.java
@@ -3,8 +3,9 @@ package io.xpipe.beacon.exchange;
 import io.xpipe.beacon.message.RequestMessage;
 import io.xpipe.beacon.message.ResponseMessage;
 import io.xpipe.core.source.DataSourceConfigInstance;
-import io.xpipe.core.store.DataStore;
+import io.xpipe.core.store.StreamDataStore;
 import lombok.Builder;
+import lombok.NonNull;
 import lombok.Value;
 import lombok.extern.jackson.Jacksonized;
 
@@ -30,6 +31,7 @@ public class ReadPreparationExchange implements MessageExchange<ReadPreparationE
     @Value
     public static class Request implements RequestMessage {
         String providerType;
+        @NonNull
         String dataStore;
     }
 
@@ -38,6 +40,6 @@ public class ReadPreparationExchange implements MessageExchange<ReadPreparationE
     @Value
     public static class Response implements ResponseMessage {
         DataSourceConfigInstance config;
-        DataStore dataStore;
+        StreamDataStore dataStore;
     }
 }
diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/WriteExecuteExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/WriteExecuteExchange.java
index 5c7cbde24..6477b5f2a 100644
--- a/beacon/src/main/java/io/xpipe/beacon/exchange/WriteExecuteExchange.java
+++ b/beacon/src/main/java/io/xpipe/beacon/exchange/WriteExecuteExchange.java
@@ -33,7 +33,7 @@ public class WriteExecuteExchange implements MessageExchange<WriteExecuteExchang
     public static class Request implements RequestMessage {
         @NonNull
         DataSourceId sourceId;
-        @NonNull
+
         DataStore dataStore;
         @NonNull
         DataSourceConfigInstance config;
diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/WritePreparationExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/WritePreparationExchange.java
index a40dd4cf7..bf092a3aa 100644
--- a/beacon/src/main/java/io/xpipe/beacon/exchange/WritePreparationExchange.java
+++ b/beacon/src/main/java/io/xpipe/beacon/exchange/WritePreparationExchange.java
@@ -41,7 +41,6 @@ public class WritePreparationExchange implements MessageExchange<WritePreparatio
     @Builder
     @Value
     public static class Response implements ResponseMessage {
-        @NonNull
         DataStore dataStore;
 
         @NonNull
diff --git a/beacon/src/main/java/module-info.java b/beacon/src/main/java/module-info.java
index 4cb627a03..0e7b653ff 100644
--- a/beacon/src/main/java/module-info.java
+++ b/beacon/src/main/java/module-info.java
@@ -32,5 +32,6 @@ module io.xpipe.beacon {
             ReadExecuteExchange,
             DialogExchange,
             InfoExchange,
+            PreStoreExchange,
             VersionExchange;
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/xpipe/core/store/OutputStreamStore.java b/core/src/main/java/io/xpipe/core/store/OutputStreamStore.java
new file mode 100644
index 000000000..6a93741f1
--- /dev/null
+++ b/core/src/main/java/io/xpipe/core/store/OutputStreamStore.java
@@ -0,0 +1,49 @@
+package io.xpipe.core.store;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class OutputStreamStore implements StreamDataStore {
+
+    private final OutputStream out;
+
+    public OutputStreamStore(OutputStream out) {
+        this.out = out;
+    }
+
+    @Override
+    public InputStream openInput() throws Exception {
+        throw new UnsupportedOperationException("No input available");
+    }
+
+    @Override
+    public OutputStream openOutput() throws Exception {
+        return new OutputStream() {
+            @Override
+            public void write(int b) throws IOException {
+                out.write(b);
+            }
+
+            @Override
+            public void write(byte[] b, int off, int len) throws IOException {
+                out.write(b, off, len);
+            }
+
+            @Override
+            public void write(byte[] b) throws IOException {
+                out.write(b);
+            }
+
+            @Override
+            public void flush() throws IOException {
+                out.flush();
+            }
+        };
+    }
+
+    @Override
+    public boolean exists() {
+        return true;
+    }
+}
diff --git a/extension/src/main/java/io/xpipe/extension/DataSourceProvider.java b/extension/src/main/java/io/xpipe/extension/DataSourceProvider.java
index 8f1ea421f..339da00bc 100644
--- a/extension/src/main/java/io/xpipe/extension/DataSourceProvider.java
+++ b/extension/src/main/java/io/xpipe/extension/DataSourceProvider.java
@@ -9,6 +9,7 @@ import io.xpipe.core.store.StreamDataStore;
 import javafx.beans.property.Property;
 import javafx.scene.layout.Region;
 
+import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -72,6 +73,8 @@ public interface DataSourceProvider {
         Map<String, String> toConfigOptions(DataSourceDescriptor<?> desc);
 
         Map<DataSourceConfig.Option, Function<String, ?>> getConverters();
+
+        List<String> getPossibleNames();
     }
 
     boolean supportsStore(DataStore store);
@@ -84,6 +87,8 @@ public interface DataSourceProvider {
 
     String getId();
 
+    DataSourceDescriptor<?> createDefaultDescriptor();
+
     /**
      * Attempt to create a useful data source descriptor from a data store.
      * The result does not need to be always right, it should only reflect the best effort.
diff --git a/extension/src/main/java/io/xpipe/extension/DataSourceProviders.java b/extension/src/main/java/io/xpipe/extension/DataSourceProviders.java
index 8de456c58..fbc3cd824 100644
--- a/extension/src/main/java/io/xpipe/extension/DataSourceProviders.java
+++ b/extension/src/main/java/io/xpipe/extension/DataSourceProviders.java
@@ -50,6 +50,15 @@ public class DataSourceProviders {
         return ALL.stream().filter(d -> d.getId().equals(name)).findAny();
     }
 
+    public static Optional<DataSourceProvider> byName(String name) {
+        if (ALL == null) {
+            throw new IllegalStateException("Not initialized");
+        }
+
+        return ALL.stream().filter(d -> d.getCliProvider() != null && d.getCliProvider().getPossibleNames().stream()
+                .anyMatch(s -> s.equalsIgnoreCase(name))).findAny();
+    }
+
     public static Optional<DataSourceProvider> byStore(DataStore store) {
         if (ALL == null) {
             throw new IllegalStateException("Not initialized");