diff --git a/translation_node/CMakeLists.txt b/translation_node/CMakeLists.txt
index c33a85a..16f9839 100644
--- a/translation_node/CMakeLists.txt
+++ b/translation_node/CMakeLists.txt
@@ -25,34 +25,53 @@ add_library(${PROJECT_NAME}_lib
         src/translations.cpp
 )
 ament_target_dependencies(${PROJECT_NAME}_lib rclcpp px4_msgs px4_msgs_old)
-add_executable(${PROJECT_NAME}
+add_executable(${PROJECT_NAME}_bin
         src/main.cpp
 )
-target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib)
-ament_target_dependencies(${PROJECT_NAME} rclcpp px4_msgs px4_msgs_old)
+target_link_libraries(${PROJECT_NAME}_bin ${PROJECT_NAME}_lib)
+ament_target_dependencies(${PROJECT_NAME}_bin rclcpp px4_msgs px4_msgs_old)
 install(TARGETS
-        ${PROJECT_NAME}
+        ${PROJECT_NAME}_bin
         DESTINATION lib/${PROJECT_NAME})
 
+option(DISABLE_SERVICES "Disable services" OFF)
 if(${ROS_DISTRO} STREQUAL "humble")
   message(WARNING "Disabling services for ROS humble (API is not supported)")
   target_compile_definitions(${PROJECT_NAME}_lib PRIVATE DISABLE_SERVICES)
+  set(DISABLE_SERVICES ON)
 endif()
 
 if(BUILD_TESTING)
   find_package(std_msgs REQUIRED)
   find_package(ament_lint_auto REQUIRED)
   find_package(ament_cmake_gtest REQUIRED)
+  find_package(rosidl_default_generators REQUIRED)
   ament_lint_auto_find_test_dependencies()
 
+  set(SRV_FILES
+          test/srv/TestV0.srv
+          test/srv/TestV1.srv
+          test/srv/TestV2.srv
+  )
+  rosidl_generate_interfaces(${PROJECT_NAME} ${SRV_FILES})
+
   # Unit tests
-  ament_add_gtest(${PROJECT_NAME}_unit_tests
+  set(TEST_SRC
           test/graph.cpp
           test/main.cpp
           test/pub_sub.cpp
   )
+  if (NOT DISABLE_SERVICES)
+    list(APPEND TEST_SRC test/services.cpp)
+  endif()
+  ament_add_gtest(${PROJECT_NAME}_unit_tests
+          ${TEST_SRC}
+  )
   target_include_directories(${PROJECT_NAME}_unit_tests PRIVATE ${CMAKE_CURRENT_LIST_DIR})
+  target_compile_options(${PROJECT_NAME}_unit_tests PRIVATE -Wno-error=sign-compare) # There is a warning from gtest internal
   target_link_libraries(${PROJECT_NAME}_unit_tests ${PROJECT_NAME}_lib)
+  rosidl_get_typesupport_target(cpp_typesupport_target ${PROJECT_NAME} "rosidl_typesupport_cpp")
+  target_link_libraries(${PROJECT_NAME}_unit_tests "${cpp_typesupport_target}")
   ament_target_dependencies(${PROJECT_NAME}_unit_tests
           std_msgs
           rclcpp
diff --git a/translation_node/package.xml b/translation_node/package.xml
index 91f083a..7d6e035 100644
--- a/translation_node/package.xml
+++ b/translation_node/package.xml
@@ -3,11 +3,14 @@
 <package format="3">
   <name>translation_node</name>
   <version>0.0.0</version>
-  <description>TODO: Package description</description>
-  <maintainer email="beat-kueng@gmx.net">beat</maintainer>
-  <license>Apache-2.0</license>
+  <description>Message version translation node</description>
+  <maintainer email="info@px4.io">PX4</maintainer>
+  <license>BSD 3-Clause</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>rosidl_default_generators</buildtool_depend>
+
+  <member_of_group>rosidl_interface_packages</member_of_group>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
diff --git a/translation_node/test/services.cpp b/translation_node/test/services.cpp
new file mode 100644
index 0000000..f962f46
--- /dev/null
+++ b/translation_node/test/services.cpp
@@ -0,0 +1,215 @@
+/****************************************************************************
+ * Copyright (c) 2024 PX4 Development Team.
+ * SPDX-License-Identifier: BSD-3-Clause
+ ****************************************************************************/
+
+#include <gtest/gtest.h>
+#include <src/monitor.h>
+#include <src/service_graph.h>
+#include <src/translation_util.h>
+
+#include <translation_node/srv/test_v0.hpp>
+#include <translation_node/srv/test_v1.hpp>
+#include <translation_node/srv/test_v2.hpp>
+
+using namespace std::chrono_literals;
+
+
+class ServiceTest : public testing::Test
+{
+protected:
+	void SetUp() override
+	{
+		_test_node = std::make_shared<rclcpp::Node>("test_node");
+		_app_node = std::make_shared<rclcpp::Node>("app_node");
+		_executor.add_node(_test_node);
+		_executor.add_node(_app_node);
+
+		for (auto& node : {_app_node, _test_node}) {
+			auto ret = rcutils_logging_set_logger_level(
+					node->get_logger().get_name(), RCUTILS_LOG_SEVERITY_DEBUG);
+			if (ret != RCUTILS_RET_OK) {
+				RCLCPP_ERROR(
+						node->get_logger(), "Error setting severity: %s",
+						rcutils_get_error_string().str);
+				rcutils_reset_error();
+			}
+		}
+	}
+
+	bool spinWithTimeout(const std::function<bool(void)>& predicate) {
+		const auto start = _app_node->now();
+		while (_app_node->now() - start < 5s) {
+			_executor.spin_some();
+			if (predicate()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	std::shared_ptr<rclcpp::Node> _test_node;
+	std::shared_ptr<rclcpp::Node> _app_node;
+	rclcpp::executors::SingleThreadedExecutor _executor;
+};
+
+class RegisteredTranslationsTest : public RegisteredTranslations {
+public:
+	RegisteredTranslationsTest() = default;
+};
+
+
+class ServiceTestV0V1 {
+public:
+	using MessageOlder = translation_node::srv::TestV0;
+	using MessageNewer = translation_node::srv::TestV1;
+
+	static constexpr const char* kTopic = "test/service";
+
+	static void fromOlder(const MessageOlder::Request &msg_older, MessageNewer::Request &msg_newer) {
+		msg_newer.request_a = msg_older.request_a;
+	}
+
+	static void toOlder(const MessageNewer::Request &msg_newer, MessageOlder::Request &msg_older) {
+		msg_older.request_a = msg_newer.request_a;
+	}
+
+	static void fromOlder(const MessageOlder::Response &msg_older, MessageNewer::Response &msg_newer) {
+		msg_newer.response_a = msg_older.response_a;
+	}
+
+	static void toOlder(const MessageNewer::Response &msg_newer, MessageOlder::Response &msg_older) {
+		msg_older.response_a = msg_newer.response_a;
+	}
+};
+
+class ServiceTestV1V2 {
+public:
+	using MessageOlder = translation_node::srv::TestV1;
+	using MessageNewer = translation_node::srv::TestV2;
+
+	static constexpr const char* kTopic = "test/service";
+
+	static void fromOlder(const MessageOlder::Request &msg_older, MessageNewer::Request &msg_newer) {
+		msg_newer.request_a = msg_older.request_a;
+		msg_newer.request_b = 1234;
+	}
+
+	static void toOlder(const MessageNewer::Request &msg_newer, MessageOlder::Request &msg_older) {
+		msg_older.request_a = msg_newer.request_a + msg_newer.request_b;
+	}
+
+	static void fromOlder(const MessageOlder::Response &msg_older, MessageNewer::Response &msg_newer) {
+		msg_newer.response_a = msg_older.response_a;
+		msg_newer.response_b = 32;
+	}
+
+	static void toOlder(const MessageNewer::Response &msg_newer, MessageOlder::Response &msg_older) {
+		msg_older.response_a = msg_newer.response_a + msg_newer.response_b;
+	}
+};
+
+
+TEST_F(ServiceTest, Test)
+{
+	RegisteredTranslationsTest registered_translations;
+	registered_translations.registerServiceDirectTranslation<ServiceTestV0V1>();
+	registered_translations.registerServiceDirectTranslation<ServiceTestV1V2>();
+
+	ServiceGraph graph(*_test_node, registered_translations.serviceTranslations());
+	Monitor monitor(*_test_node, nullptr, &graph);
+
+	const std::string topic_name = ServiceTestV1V2::kTopic;
+	const std::string topic_name_v0 = getVersionedTopicName(topic_name, ServiceTestV0V1::MessageOlder::Request::MESSAGE_VERSION);
+	const std::string topic_name_v1 = getVersionedTopicName(topic_name, ServiceTestV0V1::MessageNewer::Request::MESSAGE_VERSION);
+	const std::string topic_name_v2 = getVersionedTopicName(topic_name, ServiceTestV1V2::MessageNewer::Request::MESSAGE_VERSION);
+
+
+	// Create service + clients
+	int num_service_requests = 0;
+	auto service = _app_node->create_service<ServiceTestV0V1::MessageOlder>(topic_name_v0, [&num_service_requests](
+			const ServiceTestV0V1::MessageOlder::Request::SharedPtr request, ServiceTestV0V1::MessageOlder::Response::SharedPtr response) {
+		response->response_a = request->request_a + 1;
+		++num_service_requests;
+	});
+	auto client0 = _app_node->create_client<ServiceTestV0V1::MessageOlder>(topic_name_v0);
+	auto client1 = _app_node->create_client<ServiceTestV0V1::MessageNewer>(topic_name_v1);
+	auto client2 = _app_node->create_client<ServiceTestV1V2::MessageNewer>(topic_name_v2);
+
+	monitor.updateNow();
+
+	// Wait until there is a service for each client
+	ASSERT_TRUE(spinWithTimeout([&client0, &client1, &client2]() {
+		return client0->service_is_ready() && client1->service_is_ready() && client2->service_is_ready();
+	})) << "Timeout, no service for clients found: " << client0->service_is_ready() << client1->service_is_ready() << client2->service_is_ready();
+
+
+
+	// Make some requests
+	int expected_num_service_requests = 1;
+
+	// Client 1
+	for (int i = 0; i < 10; ++i) {
+		auto request = std::make_shared<ServiceTestV0V1::MessageNewer::Request>();
+		ServiceTestV0V1::MessageNewer::Response response;
+		request->request_a = i;
+		bool got_response = false;
+		client1->async_send_request(request, [&got_response, &response](rclcpp::Client<ServiceTestV0V1::MessageNewer>::SharedFuture result) {
+			got_response = true;
+			response = *result.get();
+		});
+
+		ASSERT_TRUE(spinWithTimeout([&got_response]() {
+			return got_response;
+		})) << "Timeout, reply not received, i=" << i;
+
+		// Check data
+		EXPECT_EQ(response.response_a, i + 1);
+		EXPECT_EQ(num_service_requests, expected_num_service_requests);
+		++expected_num_service_requests;
+	}
+
+	// Client 0
+	for (int i = 0; i < 10; ++i) {
+		auto request = std::make_shared<ServiceTestV0V1::MessageOlder::Request>();
+		ServiceTestV0V1::MessageOlder::Response response;
+		request->request_a = i * 10;
+		bool got_response = false;
+		client0->async_send_request(request, [&got_response, &response](rclcpp::Client<ServiceTestV0V1::MessageOlder>::SharedFuture result) {
+			got_response = true;
+			response = *result.get();
+		});
+
+		ASSERT_TRUE(spinWithTimeout([&got_response]() {
+			return got_response;
+		})) << "Timeout, reply not received, i=" << i;
+
+		// Check data
+		EXPECT_EQ(response.response_a, i * 10 + 1);
+		EXPECT_EQ(num_service_requests, expected_num_service_requests);
+		++expected_num_service_requests;
+	}
+
+	// Client 2
+	for (int i = 0; i < 10; ++i) {
+		auto request = std::make_shared<ServiceTestV1V2::MessageNewer::Request>();
+		ServiceTestV1V2::MessageNewer::Response response;
+		request->request_a = i * 10;
+		request->request_b = i;
+		bool got_response = false;
+		client2->async_send_request(request, [&got_response, &response](rclcpp::Client<ServiceTestV1V2::MessageNewer>::SharedFuture result) {
+			got_response = true;
+			response = *result.get();
+		});
+
+		ASSERT_TRUE(spinWithTimeout([&got_response]() {
+			return got_response;
+		})) << "Timeout, reply not received, i=" << i;
+
+		// Check data
+		EXPECT_EQ(response.response_a, i + i * 10 + 1);
+		EXPECT_EQ(response.response_b, 32);
+		EXPECT_EQ(num_service_requests, expected_num_service_requests);
+		++expected_num_service_requests;
+	}
+}
\ No newline at end of file
diff --git a/translation_node/test/srv/TestV0.srv b/translation_node/test/srv/TestV0.srv
new file mode 100644
index 0000000..ff2bee5
--- /dev/null
+++ b/translation_node/test/srv/TestV0.srv
@@ -0,0 +1,4 @@
+uint32 MESSAGE_VERSION = 0
+uint8 request_a
+---
+uint64 response_a
\ No newline at end of file
diff --git a/translation_node/test/srv/TestV1.srv b/translation_node/test/srv/TestV1.srv
new file mode 100644
index 0000000..d5efaac
--- /dev/null
+++ b/translation_node/test/srv/TestV1.srv
@@ -0,0 +1,4 @@
+uint32 MESSAGE_VERSION = 1
+uint64 request_a
+---
+uint8 response_a
diff --git a/translation_node/test/srv/TestV2.srv b/translation_node/test/srv/TestV2.srv
new file mode 100644
index 0000000..da8b793
--- /dev/null
+++ b/translation_node/test/srv/TestV2.srv
@@ -0,0 +1,6 @@
+uint32 MESSAGE_VERSION = 2
+uint8 request_a
+uint64 request_b
+---
+uint16 response_a
+uint64 response_b