diff --git a/bin/client b/bin/client
index a7343ca..d3458fc 100755
Binary files a/bin/client and b/bin/client differ
diff --git a/bin/server b/bin/server
index 19bad27..c1da27e 100755
Binary files a/bin/server and b/bin/server differ
diff --git a/src/client.c b/src/client.c
index a701670..861e2d1 100644
--- a/src/client.c
+++ b/src/client.c
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <sys/un.h>
 #include <string.h>
 #include <unistd.h>
 #include <arpa/inet.h>
@@ -32,6 +33,7 @@ typedef union socketaddr_t
 {
     socket_address_ipv4 socket_ipv4;
     socket_address_unix socket_unix;
+
 } socketaddr_t;
 
 
@@ -44,7 +46,8 @@ int domain, type, protocol;
 
 float elapsed_time_ms = 0.00;
 
-int domain, type, protocol, sin_family, address, sock;
+char* address;
+int domain, type, protocol, sin_family, sock;
 
 typedef struct sockaddr_in socket_address;
 
@@ -73,7 +76,7 @@ socketaddr_t config_server_address()
     {
         server_address.socket_ipv4.sin_family      = sin_family;
         server_address.socket_ipv4.sin_port        = htons(SERVER_PORT);
-        server_address.socket_ipv4.sin_addr.s_addr = address;
+        server_address.socket_ipv4.sin_addr.s_addr = inet_addr(address);
 
         
     }else{
@@ -90,8 +93,8 @@ void connect_to_server(int client_socket)
     struct sockaddr* address = socket_type == UNIX_SOCKET_FLAG ? (struct sockaddr*)&server_address.socket_unix : (struct sockaddr*)&server_address.socket_ipv4;
     
     int connection_response = connect(client_socket,
-                                        address, 
-                                        socket_type == UNIX_SOCKET_FLAG ? (struct sockaddr*)&server_address.socket_unix : (struct sockaddr*)&server_address.socket_unix;
+                                        address,
+                                        socket_type == UNIX_SOCKET_FLAG ? (socklen_t)sizeof(server_address.socket_unix) : (socklen_t)sizeof(server_address.socket_ipv4)
                                     );
 
     if(connection_response == SOCKET_ERROR_CODE)
@@ -109,7 +112,7 @@ int receive_buffer(int client_socket, int buffer_size)
     if(socket_type == TCP_SOCKET_FLAG) recv(client_socket, received_buffer, buffer_size, 0);
     else
     { 
-        struct sockaddr* address = socket_type == UNIX_SOCKET_FLAG ? (struct sockaddr*)&server_address.socket_unix : (struct sockaddr*)&server_address.socket_ipv4;
+        struct sockaddr* address    = socket_type == UNIX_SOCKET_FLAG ? (struct sockaddr*)&server_address.socket_unix : (struct sockaddr*)&server_address.socket_ipv4;
         socklen_t* server_addr_size = socket_type == UNIX_SOCKET_FLAG ? (socklen_t*)sizeof(server_address.socket_unix) : (socklen_t*)sizeof(server_address.socket_ipv4);
         recvfrom(client_socket, received_buffer, buffer_size, 0, address, server_addr_size);
     }
@@ -127,10 +130,11 @@ void send_buffer(int client_socket, int buffer[], size_t buffer_size)
     {
         printf("ENVIO %d\n", i);
 
-        socklen_t server_addr_size = (socklen_t)sizeof(server_address);
+        struct sockaddr* address    = socket_type == UNIX_SOCKET_FLAG ? (struct sockaddr*)&server_address.socket_unix : (struct sockaddr*)&server_address.socket_ipv4;
+        socklen_t server_addr_size = socket_type == UNIX_SOCKET_FLAG ? (socklen_t)sizeof(server_address.socket_unix) : (socklen_t)sizeof(server_address.socket_ipv4);
 
         if(socket_type == TCP_SOCKET_FLAG) send(client_socket, buffer, buffer_size, 0);
-        else sendto(client_socket, buffer, buffer_size, 0, (const struct sockaddr *)&server_address, server_addr_size);
+        else sendto(client_socket, buffer, buffer_size, 0, address, server_addr_size);
 
         receive_buffer(client_socket, buffer_size);
     }
@@ -165,7 +169,7 @@ void attribuite_socket_type(int socket_type)
         case TCP_SOCKET_FLAG: // TCP SOCKET
 
             sin_family      = AF_INET;
-            address         = inet_addr(HOST_IP);
+            address         = HOST_IP;
             sock            = SOCK_STREAM;
 
             break;
@@ -173,7 +177,7 @@ void attribuite_socket_type(int socket_type)
         case UDP_SOCKET_FLAG: // UDP SOCKET
 
             sin_family      = AF_INET;
-            address         = INADDR_ANY;
+            address         = HOST_IP;
             sock            = SOCK_DGRAM;
 
             break;
@@ -223,7 +227,7 @@ int main(int argc, char** argv)
     
     server_address = config_server_address();
 
-    connect_to_server(client_socket, server_address);
+    connect_to_server(client_socket);
 
     socket_listen(client_socket, buffer, buffer_size);
 
diff --git a/src/server.c b/src/server.c
index b0a9e11..55d597a 100644
--- a/src/server.c
+++ b/src/server.c
@@ -20,19 +20,28 @@
 #define UDP_SOCKET_FLAG     2
 #define UNIX_SOCKET_FLAG    3
 int num_of_read_bytes = 0;
-typedef struct sockaddr_in socket_address;
+
+typedef struct sockaddr_in socket_address_ipv4;
 typedef struct sockaddr_un socket_address_unix;
 
-socket_address client_address;
+
 socklen_t client_addr_len;
 
-socket_address      server_address;
-socket_address_unix server_address_unix;
+typedef union socketaddr_t
+{
+    socket_address_ipv4 socket_ipv4;
+    socket_address_unix socket_unix;
+
+} socketaddr_t;
+
+socketaddr_t client_address;
+socketaddr_t server_address;
 
 size_t buffer_size;
 int socket_type;
 
-int domain, type, protocol, sin_family, address, sock;
+char* address;
+int domain, type, protocol, sin_family, sock;
 
 void panic(char* message)
 {
@@ -54,34 +63,32 @@ int create_socket()
     return server_socket;
 }
 
-socket_address config_server_address()
+void config_server_address()
 {
 
     if(socket_type == UNIX_SOCKET_FLAG)
     {
-        socket_address server_address;
-        server_address.sin_family      = sin_family;
-        server_address.sin_port        = htons(SERVER_PORT);
-        server_address.sin_addr.s_addr = address;
+        server_address.socket_ipv4.sin_family      = sin_family;
+        server_address.socket_ipv4.sin_port        = htons(SERVER_PORT);
+        server_address.socket_ipv4.sin_addr.s_addr = inet_addr(address);
 
         
     }else{
 
-        socket_address_unix server_address;
-        server_address.sun_family = AF_UNIX;   
-        strcpy(server_address.sun_path, address); 
-        unlink(address);
+        server_address.socket_unix.sun_family = AF_UNIX;   
+        strcpy(server_address.socket_unix.sun_path, address); 
+        unlink((const char*)address);
     }   
 }
 
-void bind_server(int server_socket, socket_address server_address)
+void bind_server(int server_socket)
 {
 
-    struct sockaddr* address = (struct sockaddr*)&server_address;
+    struct sockaddr* address = socket_type == UNIX_SOCKET_FLAG ? (struct sockaddr*)&server_address.socket_unix : (struct sockaddr*)&server_address.socket_ipv4;
 
-    int server_bind_response = bind(server_socket, address, sizeof(server_address));
+    int server_bind_response = bind(server_socket, address, socket_type == UNIX_SOCKET_FLAG ? sizeof(server_address.socket_unix) : sizeof(server_address.socket_ipv4));
 
-    if (socket_type == UNIX_SOCKET_FLAG) unlink(address);
+    if (socket_type == UNIX_SOCKET_FLAG) unlink((const char*)address);
 
     if(server_bind_response == SOCKET_ERROR_CODE)
     {
@@ -90,9 +97,10 @@ void bind_server(int server_socket, socket_address server_address)
     }
 }
 
-int accept_connection(int client_socket, int server_socket, socket_address client_address, socklen_t client_addr_len)
+int accept_connection(int client_socket, int server_socket)
 {
-    struct sockaddr *address = (struct sockaddr*)&client_address;
+    socklen_t client_addr_len = socket_type == UNIX_SOCKET_FLAG ? sizeof(client_address.socket_ipv4) : sizeof(client_address.socket_unix);
+    struct sockaddr *address = socket_type == UNIX_SOCKET_FLAG ? (struct sockaddr*)&client_address.socket_unix : (struct sockaddr*)&client_address.socket_ipv4;
 
     client_socket = accept(server_socket, address, &client_addr_len);
 
@@ -106,24 +114,25 @@ int accept_connection(int client_socket, int server_socket, socket_address clien
 
 void send_buffer(int client_socket, int buffer[], int buffer_size)
 {
-    socklen_t client_addr_size = (socklen_t)sizeof(client_address);
+    socklen_t client_addr_len = socket_type == UNIX_SOCKET_FLAG ? sizeof(client_address.socket_ipv4) : sizeof(client_address.socket_unix);
+    struct sockaddr *address = socket_type  == UNIX_SOCKET_FLAG ? (struct sockaddr*)&client_address.socket_unix : (struct sockaddr*)&client_address.socket_ipv4;
 
     if(socket_type == TCP_SOCKET_FLAG) send(client_socket, buffer, buffer_size, 0);
-    else sendto(client_socket, buffer, buffer_size, 0, (const struct sockaddr *)&client_address, client_addr_size);
+    else sendto(client_socket, buffer, buffer_size, 0, address, client_addr_len);
 }
 
 int receive_buffer(int client_socket, int buffer_size)
 {
     ssize_t bytes_read;
 
-    socklen_t* client_addr_size = (socklen_t*)sizeof(client_address);
-
+    socklen_t* client_addr_len = socket_type == UNIX_SOCKET_FLAG ? (socklen_t *)sizeof(client_address.socket_ipv4) : (socklen_t *)sizeof(client_address.socket_unix);
+    struct sockaddr *address = socket_type  == UNIX_SOCKET_FLAG ? (struct sockaddr*)&client_address.socket_unix : (struct sockaddr*)&client_address.socket_ipv4;
     int received_buffer[buffer_size];
     
     for(int i = 0; i < num_of_read_bytes; i++)
     {
 
-        while((bytes_read = socket_type == UNIX_SOCKET_FLAG ?  recv(client_socket, received_buffer, buffer_size, 0) : recvfrom(client_socket, received_buffer, buffer_size, 0, (struct sockaddr *)&client_address, client_addr_size)) > 0)
+        while((bytes_read = socket_type == UNIX_SOCKET_FLAG ?  recv(client_socket, received_buffer, buffer_size, 0) : recvfrom(client_socket, received_buffer, buffer_size, 0, address, client_addr_len)) > 0)
         {
             send_buffer(client_socket, received_buffer, buffer_size);
         }
@@ -136,7 +145,7 @@ void controlc_handler()
     exit(SYSTEM_EXIT_SUCCESS);
 }
 
-void server_listen(int client_socket, int server_socket, socket_address client_address, socklen_t client_addr_len, int buffer_size)
+void server_listen(int client_socket, int server_socket, int buffer_size)
 {
     
     if (listen(server_socket, MAX_CONNECTIONS) == SOCKET_ERROR_CODE)
@@ -147,8 +156,8 @@ void server_listen(int client_socket, int server_socket, socket_address client_a
     }
 
     printf("[SERVER] - Server TCP listening on port %d...\n", SERVER_PORT);
-
-    client_socket = accept_connection(client_socket, server_socket, client_address, client_addr_len);    
+    
+    client_socket = accept_connection(client_socket, server_socket);    
     receive_buffer(client_socket, buffer_size);
 }
 
@@ -159,13 +168,13 @@ void attribuite_socket_type(int socket_type)
         case TCP_SOCKET_FLAG: // TCP SOCKET
             sin_family      = AF_INET;
             
-            address         = inet_addr(HOST_IP);
+            address         = HOST_IP;
             sock            = SOCK_STREAM;
             break;
     
         case UDP_SOCKET_FLAG: // UDP SOCKET
         
-            address         = INADDR_ANY;
+            address         = HOST_IP;
             sock            = SOCK_DGRAM;
             break;
     
@@ -209,14 +218,11 @@ int main(int argc, char** argv)
 
     server_socket = create_socket();
 
-    socket_address server_address;
-    client_addr_len = sizeof(client_address);
+    config_server_address();
 
-    server_address = config_server_address();
-
-    bind_server(server_socket, server_address);
+    bind_server(server_socket);
     
-    server_listen(client_socket, server_socket, client_address, client_addr_len, buffer_size);
+    server_listen(client_socket, server_socket, buffer_size);
 
     return SYSTEM_EXIT_SUCCESS;
 }