diff --git a/common/src/lib.rs b/common/src/lib.rs
index b57d98f..3d7cfa2 100644
--- a/common/src/lib.rs
+++ b/common/src/lib.rs
@@ -13,8 +13,10 @@ pub mod proto {
         pub mod uctovnictvo {
             include!("proto/multieko2.uctovnictvo.rs");
         }
+        pub mod table_definition {
+            include!("proto/multieko2.table_definition.rs");
+        }
         pub const FILE_DESCRIPTOR_SET: &[u8] =
             include_bytes!("proto/descriptor.bin");
     }
 }
-
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 12f578b..a19628c 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -5,6 +5,7 @@ pub mod adresar;
 pub mod uctovnictvo;
 pub mod shared;
 pub mod table_structure;
+pub mod table_definition;
 
 // Re-export run_server from the inner server module:
 pub use server::run_server;
diff --git a/server/src/server/run.rs b/server/src/server/run.rs
index 0a52092..7085b42 100644
--- a/server/src/server/run.rs
+++ b/server/src/server/run.rs
@@ -6,11 +6,13 @@ use common::proto::multieko2::FILE_DESCRIPTOR_SET;
 use crate::server::services::{
     AdresarService, 
     UctovnictvoService, 
-    TableStructureHandler
+    TableStructureHandler,
+    TableDefinitionService
 };
 use common::proto::multieko2::adresar::adresar_server::AdresarServer;
 use common::proto::multieko2::uctovnictvo::uctovnictvo_server::UctovnictvoServer;
 use common::proto::multieko2::table_structure::table_structure_service_server::TableStructureServiceServer;
+use common::proto::multieko2::table_definition::table_definition_server::TableDefinitionServer;
 
 pub async fn run_server(db_pool: sqlx::PgPool) -> Result<(), Box<dyn std::error::Error>> {
     let addr = "[::1]:50051".parse()?;
@@ -19,10 +21,14 @@ pub async fn run_server(db_pool: sqlx::PgPool) -> Result<(), Box<dyn std::error:
         .register_encoded_file_descriptor_set(FILE_DESCRIPTOR_SET)
         .build_v1()?;
 
+    // Initialize the TableDefinitionService
+    let table_definition_service = TableDefinitionService { db_pool: db_pool.clone() };
+
     Server::builder()
         .add_service(AdresarServer::new(AdresarService { db_pool: db_pool.clone() }))
         .add_service(UctovnictvoServer::new(UctovnictvoService { db_pool: db_pool.clone() }))
-        .add_service(TableStructureServiceServer::new(TableStructureHandler { db_pool }))
+        .add_service(TableStructureServiceServer::new(TableStructureHandler { db_pool: db_pool.clone() }))
+        .add_service(TableDefinitionServer::new(table_definition_service)) // Add the service here
         .add_service(reflection_service)
         .serve(addr)
         .await?;
diff --git a/server/src/server/services/mod.rs b/server/src/server/services/mod.rs
index 4b0c195..dd8608d 100644
--- a/server/src/server/services/mod.rs
+++ b/server/src/server/services/mod.rs
@@ -3,8 +3,9 @@
 pub mod adresar_service;
 pub mod table_structure_service;
 pub mod uctovnictvo_service;
+pub mod table_definition_service;
 
 pub use adresar_service::AdresarService;
 pub use table_structure_service::TableStructureHandler;
 pub use uctovnictvo_service::UctovnictvoService;
-
+pub use table_definition_service::TableDefinitionService;