diff --git a/bakanet/src/platform/linux/linux_dns_lookup.cpp b/bakanet/src/platform/linux/linux_dns_lookup.cpp
index e2a9d34..03c5bfd 100755
--- a/bakanet/src/platform/linux/linux_dns_lookup.cpp
+++ b/bakanet/src/platform/linux/linux_dns_lookup.cpp
@@ -1,4 +1,4 @@
-#include <bakanet/sock_layer/dns_lookup.h>
+#include <bakanet/core/dns_lookup.h>
 
 namespace Bk::Net {
 	std::vector<std::string> dns_lookup(const std::string &host_name, IpVersion ipv)
diff --git a/bakanet/src/platform/linux/linux_ip_address.cpp b/bakanet/src/platform/linux/linux_ip_address.cpp
index 7ef3db8..a872ca4 100755
--- a/bakanet/src/platform/linux/linux_ip_address.cpp
+++ b/bakanet/src/platform/linux/linux_ip_address.cpp
@@ -1,4 +1,4 @@
-#include <bakanet/sock_layer/ip_address.h>
+#include <bakanet/core/ip_address.h>
 #include <string.h>
 
 namespace Bk::Net {
diff --git a/bakanet/src/platform/linux/linux_socket.cpp b/bakanet/src/platform/linux/linux_socket.cpp
index 823a0fa..803a0f0 100755
--- a/bakanet/src/platform/linux/linux_socket.cpp
+++ b/bakanet/src/platform/linux/linux_socket.cpp
@@ -1,11 +1,21 @@
 #include "linux_socket.h"
 
 namespace Bk::Net {
+	LinuxSocket::LinuxSocket(int id, IpVersion ver, IpProtocol proto)
+	: id(id), ip_proto(proto)
+	{
+		char myIP[16] = "               ";
+		socklen_t len = sizeof(addr);
+    	getsockname(id, (struct sockaddr*)&addr, &len);
+		inet_ntop((int)ver, &addr, myIP, sizeof(myIP));
+		ip_addr = IpAddress(std::string(myIP, 16), ver);
+	}
+
 	LinuxSocket::LinuxSocket(IpAddress ip, int port, IpProtocol proto)
 	: ip_addr(ip), ip_proto(proto)
 	{
 		//LinuxSocket creation step
-		if ((socket_id = socket((int)ip_addr.version, (int)ip_proto, 0)) < 0) 
+		if ((id = socket((int)ip_addr.version, (int)ip_proto, 0)) < 0) 
 		{
 	        perror("socket failed");
 	        exit(EXIT_FAILURE);
@@ -17,14 +27,14 @@ namespace Bk::Net {
 
 	LinuxSocket::~LinuxSocket()
 	{
-		close(socket_id);
+		close(id);
 	}
 
 	bool LinuxSocket::init()
 	{
 	    //Binding step
 		int status;
-	    if ((status = bind(socket_id, (struct sockaddr*)&addr, sizeof(addr)) < 0)) 
+	    if ((status = bind(id, (struct sockaddr*)&addr, sizeof(addr)) < 0)) 
 	    {
 			perror("bind failed");
 	      	return false;
@@ -35,23 +45,23 @@ namespace Bk::Net {
 	bool LinuxSocket::start(int cpt_conn)
 	{
 	    //Listening step
-	    if (listen(socket_id, cpt_conn) < 0) 
+	    if (listen(id, cpt_conn) < 0) 
 	    {
 	    	return false;
 	    }
 	    return true;
 	}
 
-	Connection LinuxSocket::ack()
+	std::unique_ptr<Socket> LinuxSocket::ack()
 	{
 		
 		socklen_t addrlen = sizeof(addr);
-		return accept(socket_id, (struct sockaddr*)&addr, &addrlen);
+		return std::unique_ptr<Socket>(Socket::create(accept(id, (struct sockaddr*)&addr, &addrlen), ip_addr.version, ip_proto));
 	}
 
 	bool LinuxSocket::conn()
 	{
-		if (connect(socket_id, (struct sockaddr*)&addr, sizeof(addr)) < 0) 
+		if (connect(id, (struct sockaddr*)&addr, sizeof(addr)) < 0) 
 		{
 	        return false;
     	}
@@ -60,14 +70,14 @@ namespace Bk::Net {
 
 	void LinuxSocket::emit(std::vector<char> packet)
 	{
-		write(socket_id, packet.data(), packet.size());
+		write(id, packet.data(), packet.size());
 	}
 
 	std::vector<char> LinuxSocket::obtain(int size)
 	{
 		std::vector<char> buffer;
 		buffer.resize(size);
-		int read_size = read(socket_id, buffer.data(), buffer.size() - 1);
+		int read_size = read(id, buffer.data(), buffer.size() - 1);
 		buffer.resize(read_size);
 		return buffer;
 	}
@@ -76,4 +86,9 @@ namespace Bk::Net {
 	{
 		return std::unique_ptr<Socket>(new LinuxSocket(ip, port, proto));
 	}
+
+	std::unique_ptr<Socket> Socket::create(int id, IpVersion ver, IpProtocol proto)
+	{
+		return std::unique_ptr<Socket>(new LinuxSocket(id, ver, proto));
+	}
 }
\ No newline at end of file
diff --git a/bakanet/src/platform/linux/linux_socket.h b/bakanet/src/platform/linux/linux_socket.h
index 66c2a46..f8533c9 100755
--- a/bakanet/src/platform/linux/linux_socket.h
+++ b/bakanet/src/platform/linux/linux_socket.h
@@ -1,26 +1,28 @@
 #pragma once
 
-#include <bakanet/sock_layer/socket.h>
+#include <bakanet/core/socket.h>
 
 namespace Bk::Net {
 	class LinuxSocket : public Socket
 	{
         public:
             LinuxSocket(IpAddress ip, int port, IpProtocol proto);
+            LinuxSocket(int id, IpVersion ver, IpProtocol proto);
             virtual ~LinuxSocket();
 
             bool init() override;
             bool start(int cpt_conn) override;
-            Connection ack() override;
+            std::unique_ptr<Socket> ack() override;
             bool conn() override;
 
-            int get_raw_socket() override { return socket_id; }
+            int get_raw_socket() override { return id; }
+            const std::string get_ip() override { return ip_addr.str; }
 
             void emit(std::vector<char> packet) override;
             std::vector<char> obtain(int size) override;
 
         private:
-            Connection socket_id;
+            Connection id;
             struct sockaddr_in addr;
             IpAddress ip_addr;
             IpProtocol ip_proto;