2 files changed, 15 insertions, 7 deletions
diff --git a/modules/remote-filesystem/c++/remote.hpp b/modules/remote-filesystem/c++/remote.hpp
index 8390501..0225bc5 100644
--- a/modules/remote-filesystem/c++/remote.hpp
+++ b/modules/remote-filesystem/c++/remote.hpp
@@ -2,6 +2,7 @@
 
 #include <filesystem>
 
+#include <forstio/codec/schema_hash.hpp>
 #include <forstio/remote/remote.hpp>
 
 namespace saw {
@@ -35,6 +36,8 @@ private:
 
 	std::map<std::string, ptr<i_data_server<rmt::File>>> registered_data_servers_;
 public:
+	remote() = default;
+
 	error_or<own<remote_address<rmt::File>>> parse_address(const std::string_view& path_v){
 		return heap<remote_address<rmt::File>>(path_v);
 	}
@@ -47,8 +50,15 @@ public:
 		}
 
 		auto dat_srv = heap<data_server<Schema, Encode, rmt::File>>(*this, addr);
-		insert_res.first->second = {dat_srv};
+		insert_res.first->second = ptr<i_data_server<rmt::File>>{*dat_srv};
 		return dat_srv;
 	}
+
+	/**
+	 * Internal deregister function
+	 */
+	error_or<void> deregister_data_server(ptr<i_data_server<rmt::File>> srv){
+		return make_error<err::not_implemented>();
+	}
 };
 }
diff --git a/modules/remote-filesystem/c++/transport.hpp b/modules/remote-filesystem/c++/transfer.hpp
index 0db4600..e3df023 100644
--- a/modules/remote-filesystem/c++/transport.hpp
+++ b/modules/remote-filesystem/c++/transfer.hpp
@@ -2,11 +2,11 @@
 
 #include "remote.hpp"
 
-#include <forstio/remote/transport.hpp>
+#include <forstio/remote/transfer.hpp>
 
 namespace saw {
-template<typename Schema, typename Encode>
-class data_server<Schema, Encode, rmt::File> final : public i_data_server<rmt::File> {
+template<typename Schema, typename Encoding>
+class data_server<Schema, Encoding, rmt::File> final : public i_data_server<rmt::File> {
 private:
 	ptr<remote<rmt::File>> remote_;
 	remote_address<rmt::File> addr_;
@@ -19,7 +19,7 @@ public:
 	{}
 
 	~data_server(){
-		remote().deregister_data_server(*this);
+		remote_().deregister_data_server(*this);
 	}
 
 	SAW_FORBID_MOVE(data_server);
@@ -30,8 +30,6 @@ public:
 	}
 
 	error_or<void> send(const data<Schema, Encoding>& dat, id<Schema> store_id){
-		try {
-		}
 		return make_error<err::not_implemented>();
 	}