diff --git a/ros_monitoring_msgs/CMakeLists.txt b/ros_monitoring_msgs/CMakeLists.txt
index 1098fdd..0fbe6fd 100644
--- a/ros_monitoring_msgs/CMakeLists.txt
+++ b/ros_monitoring_msgs/CMakeLists.txt
@@ -24,6 +24,7 @@ add_message_files(
   MetricDimension.msg
   MetricData.msg
   MetricList.msg
+  MetricUnit.msg
 )
 
 ## Generate added messages and services with any dependencies listed here
diff --git a/ros_monitoring_msgs/msg/MetricData.msg b/ros_monitoring_msgs/msg/MetricData.msg
index 0d17127..484db26 100644
--- a/ros_monitoring_msgs/msg/MetricData.msg
+++ b/ros_monitoring_msgs/msg/MetricData.msg
@@ -1,24 +1,5 @@
 std_msgs/Header header
 
-# Constants for commonly used units
-string UNIT_SEC=sec
-string UNIT_MILLI_SEC=msec
-string UNIT_MICRO_SEC=usec
-string UNIT_PERCENTAGE=percent
-string UNIT_COUNT=count
-string UNIT_COUNT_PER_SEC=count_per_sec
-string UNIT_BYTES=bytes
-string UNIT_KILOBYTES=kilobytes
-string UNIT_MEGABYTES=megabytes
-string UNIT_GIGABYTES=gigabytes
-string UNIT_TERABYTES=terabytes
-string UNIT_BYTES_PER_SEC=bytes_per_sec
-string UNIT_KILOBYTES_PER_SEC=kilobytes_per_sec
-string UNIT_MEGABYTES_PER_SEC=megabytes_per_sec
-string UNIT_GIGABYTES_PER_SEC=gigabytes_per_sec
-string UNIT_TERABYTES_PER_SEC=terabytes_per_sec
-string UNIT_NONE=none
-
 # Constant for NA string
 string NA_STRING=non_applicable_string_value
 
diff --git a/ros_monitoring_msgs/msg/MetricList.msg b/ros_monitoring_msgs/msg/MetricList.msg
index a719485..0a64d7d 100644
--- a/ros_monitoring_msgs/msg/MetricList.msg
+++ b/ros_monitoring_msgs/msg/MetricList.msg
@@ -3,3 +3,4 @@
 ###################################
 
 MetricData[] metrics
+ 
\ No newline at end of file
diff --git a/ros_monitoring_msgs/msg/MetricUnit.msg b/ros_monitoring_msgs/msg/MetricUnit.msg
new file mode 100644
index 0000000..7a54920
--- /dev/null
+++ b/ros_monitoring_msgs/msg/MetricUnit.msg
@@ -0,0 +1,43 @@
+
+# Constants for commonly used units
+string UNIT_SEC=sec
+string UNIT_MILLI_SEC=msec
+string UNIT_MICRO_SEC=usec
+string UNIT_PERCENTAGE=percent
+string UNIT_COUNT=count
+string UNIT_COUNT_PER_SEC=count_per_sec
+string UNIT_BYTES=bytes
+string UNIT_KILOBYTES=kilobytes
+string UNIT_MEGABYTES=megabytes
+string UNIT_GIGABYTES=gigabytes
+string UNIT_TERABYTES=terabytes
+string UNIT_BYTES_PER_SEC=bytes_per_sec
+string UNIT_KILOBYTES_PER_SEC=kilobytes_per_sec
+string UNIT_MEGABYTES_PER_SEC=megabytes_per_sec
+string UNIT_GIGABYTES_PER_SEC=gigabytes_per_sec
+string UNIT_TERABYTES_PER_SEC=terabytes_per_sec
+
+# Units for temperature
+string UNIT_DEGREE_FAHRENHEIT=degree_fahrenheit
+string UNIT_DEGREE_CELCIUS=degree_celcius
+string UNIT_KELVIN=kelvin
+
+# Units for length
+string UNIT_METER=meter
+string UNIT_CENTIMETER=centimeter
+
+# Units of angle
+string UNIT_RADIAN=radian
+string UNIT_DEGREE=degree
+
+# Units of speed/velocity
+string UNIT_METER_PER_SEC=meter_per_sec
+string UNIT_RADIAN_PER_SEC=radian_per_sec
+
+# Units of power
+string UNIT_CURRENT=amphere
+string UNIT_VOLTS=volt
+string UNIT_POWER=watt
+
+
+string UNIT_NONE=none