diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bf6d25..8f4225d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 find_package(Modelec COMPONENTS
         Utils
+        CLParser
         REQUIRED
 )
 
@@ -14,4 +15,5 @@ add_executable(socketServer main.cpp
 
 target_link_libraries(socketServer
         Modelec::Utils
+        Modelec::CLParser
 )
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
index fc40ea7..6728319 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,6 +1,8 @@
 #include "TCPServer.h"
 #include <csignal>
 
+#include <Modelec/CLParser.h>
+
 std::atomic<bool> shouldStop = false;
 
 void signalHandler( int signum ) {
@@ -11,10 +13,9 @@ int main(int argc, char* argv[]) {
     signal(SIGINT, signalHandler);
     signal(SIGTERM, signalHandler);
 
-    int port = 8080;
-    if (argc >= 2) {
-        port = std::stoi(argv[1]);
-    }
+    CLParser clParser(argc, argv);
+
+    int port = clParser.getOption<int>("port", 8080);
 
     TCPServer server(port);