diff --git a/Makefile b/Makefile
index cc34208..3ad7c51 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: sben-tay <sben-tay@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/05/02 15:40:00 by rparodi           #+#    #+#              #
-#    Updated: 2025/05/20 21:43:49 by rparodi          ###   ########.fr        #
+#    Updated: 2025/05/21 13:01:09 by rparodi          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -24,12 +24,14 @@ CXXFLAGS = -Werror -Wextra -Wall -std=c++98
 SESSION = test-irc
 
 # Sources
-SRC =	sources/core/main.cpp \
-		sources/core/Server.cpp \
+SRC =	sources/core/logs.cpp \
 		sources/core/check.cpp \
+		sources/core/PollManager.cpp \
 		sources/core/parser.cpp \
-		sources/core/PollManager.cpp
-
+		sources/core/main.cpp \
+		sources/core/Server.cpp \
+		sources/user/user.cpp \
+		sources/channel/channel.cpp
 
 INC_DIR = include/core \
 		  include
diff --git a/include/server.hpp b/include/server.hpp
index 1e96cc7..96a78b0 100644
--- a/include/server.hpp
+++ b/include/server.hpp
@@ -6,7 +6,7 @@
 /*   By: rparodi <rparodi@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/05/20 21:50:32 by rparodi           #+#    #+#             */
-/*   Updated: 2025/05/20 21:53:29 by rparodi          ###   ########.fr       */
+/*   Updated: 2025/05/21 13:03:01 by rparodi          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,13 +18,13 @@
 class Server {
 	private:
 		int _port;
-		int _server_fd;
+		int _serverFd;
 		std::string _password;
-		PollManager _poll_manager;
+		PollManager _pollManager;
 	public:
 		Server(int port, const std::string &password);
 		~Server();
 		void start();
-		int getPort() const;
+		unsigned short int getPort() const;
 		void showInfo() const;
 };