diff --git a/capella_ros_tools/__main__.py b/capella_ros_tools/__main__.py
index be47277..a3f0a81 100644
--- a/capella_ros_tools/__main__.py
+++ b/capella_ros_tools/__main__.py
@@ -14,7 +14,7 @@
 from capella_ros_tools.snapshot import app
 
 
-@click.group(context_settings={"default_map": {}})
+@click.group()
 @click.version_option(
     version=capella_ros_tools.__version__,
     prog_name="capella-ros-tools",
@@ -25,20 +25,16 @@ def cli():
 
 
 @cli.command("import")
-@click.argument(
-    "msg_path", type=str, required=True, help="Path to ROS messages."
-)
+@click.argument("msg_path", type=str, required=True)
 @click.argument(
     "capella_path",
     type=click.Path(path_type=Path),
     required=True,
-    help="Path to Capella model.",
 )
 @click.argument(
     "layer",
     type=click.Choice(["oa", "la", "sa", "pa"], case_sensitive=False),
     required=True,
-    help="Layer of Capella data package.",
 )
 @click.option(
     "--exists-action",
@@ -86,25 +82,16 @@ def import_msg(
     required=True,
 )
 @click.argument("msg_path", type=click.Path(path_type=Path), required=True)
-@click.option(
-    "--exists-action",
-    "action",
-    type=click.Choice(
-        ["keep", "overwrite", "abort", "ask"], case_sensitive=False
-    ),
-    default="ask" if sys.stdin.isatty() else "abort",
-    help="Default action when an element already exists.",
-)
 def export_capella(
     capella_path: t.Any,
-    msg_path: Path,
     layer: str,
+    msg_path: Path,
 ):
     """Export Capella data package to ROS messages."""
     if not Path(capella_path).exists():
         capella_path = capellambse.filehandler.get_filehandler(capella_path)
 
-    converter: t.Any = capella2msg.Converter(capella_path, msg_path, layer)
+    converter: t.Any = capella2msg.Converter(msg_path, capella_path, layer)
     converter.convert()
 
 
diff --git a/capella_ros_tools/modules/messages/parser.py b/capella_ros_tools/modules/messages/parser.py
index 01baea0..22d691b 100644
--- a/capella_ros_tools/modules/messages/parser.py
+++ b/capella_ros_tools/modules/messages/parser.py
@@ -254,7 +254,6 @@ def _process_enums(msg):
                 field.type.name = enum.name
                 return
 
-        for field in msg.fields:
             if field.type.name == enum.values[0].type.name:
                 # enum type is the same as the field type
                 field.type.name = msg.name + _get_enum_identifier(field.name)
diff --git a/capella_ros_tools/scripts/capella2msg.py b/capella_ros_tools/scripts/capella2msg.py
index 8406719..6cfeed4 100644
--- a/capella_ros_tools/scripts/capella2msg.py
+++ b/capella_ros_tools/scripts/capella2msg.py
@@ -39,8 +39,8 @@ class Converter:
 
     def __init__(
         self,
-        capella_path: t.Any,
         msg_path: t.Any,
+        capella_path: t.Any,
         layer: str,
     ) -> None:
         self.msg_path = msg_path
diff --git a/docs/source/examples/Export capella.ipynb b/docs/source/examples/Export capella.ipynb
index 7341e3f..fce0818 100644
--- a/docs/source/examples/Export capella.ipynb	
+++ b/docs/source/examples/Export capella.ipynb	
@@ -43,7 +43,7 @@
     }
    ],
    "source": [
-    "converter = capella2msg.Converter(msg_path, capella_path, layer, \"o\", False)"
+    "converter = capella2msg.Converter(msg_path, capella_path, layer)"
    ]
   },
   {
diff --git a/docs/source/examples/Import messages.ipynb b/docs/source/examples/Import messages.ipynb
index 163435a..a23069c 100644
--- a/docs/source/examples/Import messages.ipynb	
+++ b/docs/source/examples/Import messages.ipynb	
@@ -9,7 +9,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -20,7 +20,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -31,7 +31,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -44,73 +44,42 @@
     }
    ],
    "source": [
-    "converter = msg2capella.Converter(msg_path, capella_path, layer, \"o\", False)"
+    "converter = msg2capella.Converter(msg_path, capella_path, layer, \"replace\", False)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [
     {
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package actionlib_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package diagnostic_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package geometry_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package nav_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package sensor_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package shape_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package std_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package stereo_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package trajectory_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package visualization_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum GoalStatusStatus.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum GoalStatusStatus already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class GoalID.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class GoalStatus.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class GoalStatusArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted GoalStatusStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum GoalStatusStatus.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class GoalID already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class GoalStatus already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class GoalStatusArray already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum DiagnosticStatusLevel.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted GoalID.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted GoalStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted GoalStatusArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class GoalID.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class GoalStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class GoalStatusArray.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum DiagnosticStatusLevel already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class DiagnosticArray.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class DiagnosticStatus.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class KeyValue.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted DiagnosticStatusLevel.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum DiagnosticStatusLevel.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class DiagnosticArray already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class DiagnosticStatus already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class KeyValue already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Accel.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class AccelStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class AccelWithCovariance.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class AccelWithCovarianceStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Inertia.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class InertiaStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Point.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Point32.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class PointStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Polygon.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class PolygonStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Pose.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Pose2D.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class PoseArray.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class PoseStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class PoseWithCovariance.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class PoseWithCovarianceStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Quaternion.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class QuaternionStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Transform.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class TransformStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Twist.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class TwistStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class TwistWithCovariance.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class TwistWithCovarianceStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Vector3.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Vector3Stamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Wrench.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class WrenchStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted DiagnosticArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted DiagnosticStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted KeyValue.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class DiagnosticArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class DiagnosticStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class KeyValue.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Accel already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class AccelStamped already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class AccelWithCovariance already exists.\n",
@@ -140,25 +109,79 @@
       "INFO:capella_ros_tools.modules.capella.serializer:Class Vector3Stamped already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Wrench already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class WrenchStamped already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class GridCells.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MapMetaData.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class OccupancyGrid.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Odometry.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Path.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Accel.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted AccelStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted AccelWithCovariance.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted AccelWithCovarianceStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Inertia.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted InertiaStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Point.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Point32.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PointStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Polygon.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PolygonStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Pose.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Pose2D.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PoseArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PoseStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PoseWithCovariance.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PoseWithCovarianceStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Quaternion.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted QuaternionStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Transform.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransformStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Twist.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TwistStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TwistWithCovariance.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TwistWithCovarianceStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Vector3.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Vector3Stamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Wrench.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted WrenchStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Accel.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class AccelStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class AccelWithCovariance.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class AccelWithCovarianceStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Inertia.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class InertiaStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Point.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Point32.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class PointStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Polygon.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class PolygonStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Pose.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Pose2D.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class PoseArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class PoseStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class PoseWithCovariance.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class PoseWithCovarianceStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Quaternion.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class QuaternionStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Transform.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class TransformStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Twist.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class TwistStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class TwistWithCovariance.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class TwistWithCovarianceStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Vector3.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Vector3Stamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Wrench.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class WrenchStamped.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class GridCells already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class MapMetaData already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class OccupancyGrid already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Odometry already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Path already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum PowerSupplyStatus.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum PowerSupplyHealth.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum PowerSupplyTechnology.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Type.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum NavSatFixPositionCovarianceType.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Status.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Service.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum PointFieldDatatype.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum RangeRadiationType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted GridCells.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MapMetaData.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted OccupancyGrid.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Odometry.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Path.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class GridCells.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MapMetaData.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class OccupancyGrid.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Odometry.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Path.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum PowerSupplyStatus already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum PowerSupplyHealth already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum PowerSupplyTechnology already exists.\n",
@@ -168,33 +191,24 @@
       "INFO:capella_ros_tools.modules.capella.serializer:Enum Service already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum PointFieldDatatype already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum RangeRadiationType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class BatteryState.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class CameraInfo.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ChannelFloat32.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class CompressedImage.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class FluidPressure.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Illuminance.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Image.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Imu.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class JointState.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Joy.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class JoyFeedback.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class JoyFeedbackArray.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class LaserEcho.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class LaserScan.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MagneticField.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MultiDOFJointState.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MultiEchoLaserScan.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class NavSatFix.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class NavSatStatus.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class PointCloud.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class PointCloud2.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class PointField.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Range.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class RegionOfInterest.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class RelativeHumidity.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Temperature.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class TimeReference.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PowerSupplyStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PowerSupplyHealth.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PowerSupplyTechnology.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Type.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted NavSatFixPositionCovarianceType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Status.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Service.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PointFieldDatatype.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted RangeRadiationType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum PowerSupplyStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum PowerSupplyHealth.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum PowerSupplyTechnology.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Type.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum NavSatFixPositionCovarianceType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Status.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Service.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum PointFieldDatatype.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum RangeRadiationType.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class BatteryState already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class CameraInfo already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class ChannelFloat32 already exists.\n",
@@ -222,53 +236,87 @@
       "INFO:capella_ros_tools.modules.capella.serializer:Class RelativeHumidity already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Temperature already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class TimeReference already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum SolidPrimitiveType.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Box.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Cylinder.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Cone.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum PrismHeight.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted BatteryState.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted CameraInfo.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ChannelFloat32.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted CompressedImage.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted FluidPressure.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Illuminance.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Image.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Imu.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted JointState.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Joy.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted JoyFeedback.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted JoyFeedbackArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted LaserEcho.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted LaserScan.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MagneticField.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MultiDOFJointState.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MultiEchoLaserScan.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted NavSatFix.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted NavSatStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PointCloud.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PointCloud2.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PointField.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Range.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted RegionOfInterest.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted RelativeHumidity.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Temperature.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TimeReference.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class BatteryState.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class CameraInfo.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ChannelFloat32.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class CompressedImage.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class FluidPressure.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Illuminance.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Image.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Imu.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class JointState.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Joy.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class JoyFeedback.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class JoyFeedbackArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class LaserEcho.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class LaserScan.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MagneticField.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MultiDOFJointState.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MultiEchoLaserScan.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class NavSatFix.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class NavSatStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class PointCloud.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class PointCloud2.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class PointField.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Range.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class RegionOfInterest.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class RelativeHumidity.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Temperature.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class TimeReference.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum SolidPrimitiveType already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum Box already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum Cylinder already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum Cone already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum PrismHeight already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Mesh.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MeshTriangle.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Plane.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class SolidPrimitive.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted SolidPrimitiveType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Box.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Cylinder.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Cone.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PrismHeight.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum SolidPrimitiveType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Box.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Cylinder.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Cone.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum PrismHeight.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Mesh already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class MeshTriangle already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Plane already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class SolidPrimitive already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Bool.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Byte.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ByteMultiArray.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Char.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ColorRGBA.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Float32.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Float32MultiArray.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Float64.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Float64MultiArray.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Header.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int16.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int16MultiArray.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int32.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int32MultiArray.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int64.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int64MultiArray.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int8.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int8MultiArray.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MultiArrayDimension.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MultiArrayLayout.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class String.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt16.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt16MultiArray.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt32.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt32MultiArray.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt64.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt64MultiArray.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt8.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt8MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Mesh.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MeshTriangle.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Plane.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted SolidPrimitive.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Mesh.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MeshTriangle.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Plane.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class SolidPrimitive.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Bool already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Byte already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class ByteMultiArray already exists.\n",
@@ -298,23 +346,79 @@
       "INFO:capella_ros_tools.modules.capella.serializer:Class UInt64MultiArray already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class UInt8 already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class UInt8MultiArray already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class DisparityImage.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Bool.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Byte.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ByteMultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Char.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ColorRGBA.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Float32.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Float32MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Float64.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Float64MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Header.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Int16.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Int16MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Int32.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Int32MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Int64.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Int64MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Int8.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Int8MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MultiArrayDimension.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MultiArrayLayout.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted String.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted UInt16.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted UInt16MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted UInt32.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted UInt32MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted UInt64.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted UInt64MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted UInt8.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted UInt8MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Bool.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Byte.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ByteMultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Char.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ColorRGBA.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Float32.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Float32MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Float64.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Float64MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Header.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int16.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int16MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int32.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int32MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int64.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int64MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int8.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Int8MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MultiArrayDimension.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MultiArrayLayout.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class String.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt16.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt16MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt32.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt32MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt64.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt64MultiArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt8.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class UInt8MultiArray.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class DisparityImage already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class JointTrajectory.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class JointTrajectoryPoint.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MultiDOFJointTrajectory.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MultiDOFJointTrajectoryPoint.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted DisparityImage.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class DisparityImage.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class JointTrajectory already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class JointTrajectoryPoint already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class MultiDOFJointTrajectory already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class MultiDOFJointTrajectoryPoint already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum ImageMarkerId.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum InteractiveMarkerControlOrientationMode.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum InteractiveMarkerFeedbackEventType.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Mouse.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum InteractiveMarkerUpdateType.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum MarkerId.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum MenuEntryCommandType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted JointTrajectory.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted JointTrajectoryPoint.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MultiDOFJointTrajectory.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MultiDOFJointTrajectoryPoint.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class JointTrajectory.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class JointTrajectoryPoint.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MultiDOFJointTrajectory.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MultiDOFJointTrajectoryPoint.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum ImageMarkerId already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum InteractiveMarkerControlOrientationMode already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum InteractiveMarkerFeedbackEventType already exists.\n",
@@ -322,18 +426,20 @@
       "INFO:capella_ros_tools.modules.capella.serializer:Enum InteractiveMarkerUpdateType already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum MarkerId already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum MenuEntryCommandType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ImageMarker.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class InteractiveMarker.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class InteractiveMarkerControl.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class InteractiveMarkerFeedback.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class InteractiveMarkerInit.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class InteractiveMarkerPose.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class InteractiveMarkerUpdate.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Marker.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MarkerArray.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MenuEntry.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MeshFile.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class UVCoordinate.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ImageMarkerId.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted InteractiveMarkerControlOrientationMode.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted InteractiveMarkerFeedbackEventType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Mouse.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted InteractiveMarkerUpdateType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MarkerId.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MenuEntryCommandType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum ImageMarkerId.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum InteractiveMarkerControlOrientationMode.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum InteractiveMarkerFeedbackEventType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Mouse.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum InteractiveMarkerUpdateType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum MarkerId.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum MenuEntryCommandType.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class ImageMarker already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class InteractiveMarker already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class InteractiveMarkerControl already exists.\n",
@@ -346,51 +452,57 @@
       "INFO:capella_ros_tools.modules.capella.serializer:Class MenuEntry already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class MeshFile already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class UVCoordinate already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package action_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package builtin_interfaces.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package lifecycle_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package rcl_interfaces.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package rosgraph_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package service_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package statistics_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package test_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package type_description_interfaces.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum GoalStatusStatus.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum StatusCanceling.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum StatusCanceled.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum StatusAborted.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ImageMarker.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted InteractiveMarker.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted InteractiveMarkerControl.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted InteractiveMarkerFeedback.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted InteractiveMarkerInit.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted InteractiveMarkerPose.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted InteractiveMarkerUpdate.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Marker.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MarkerArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MenuEntry.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MeshFile.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted UVCoordinate.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ImageMarker.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class InteractiveMarker.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class InteractiveMarkerControl.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class InteractiveMarkerFeedback.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class InteractiveMarkerInit.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class InteractiveMarkerPose.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class InteractiveMarkerUpdate.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Marker.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MarkerArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MenuEntry.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MeshFile.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class UVCoordinate.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum GoalStatusStatus already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum StatusCanceling already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum StatusCanceled already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum StatusAborted already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class GoalInfo.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class GoalStatus.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class GoalStatusArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted GoalStatusStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted StatusCanceling.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted StatusCanceled.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted StatusAborted.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum GoalStatusStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum StatusCanceling.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum StatusCanceled.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum StatusAborted.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class GoalInfo already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class GoalStatus already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class GoalStatusArray already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Duration.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Time.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted GoalInfo.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted GoalStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted GoalStatusArray.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class GoalInfo.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class GoalStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class GoalStatusArray.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Duration already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Time already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum StateId.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum PrimaryStateActive.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionStateConfiguring.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionStateShuttingdown.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionStateDeactivating.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionStateErrorprocessing.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionId.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionActivate.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionUnconfiguredShutdown.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionActiveShutdown.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionOnConfigure.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionOnCleanup.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionOnActivate.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionOnDeactivate.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionOnShutdown.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionOnError.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionCallbackFailure.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionCallbackError.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Duration.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Time.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Duration.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Time.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum StateId already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum PrimaryStateActive already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum TransitionStateConfiguring already exists.\n",
@@ -409,36 +521,69 @@
       "INFO:capella_ros_tools.modules.capella.serializer:Enum TransitionOnError already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum TransitionCallbackFailure already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum TransitionCallbackError already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class State.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Transition.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class TransitionDescription.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class TransitionEvent.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted StateId.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted PrimaryStateActive.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionStateConfiguring.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionStateShuttingdown.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionStateDeactivating.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionStateErrorprocessing.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionId.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionActivate.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionUnconfiguredShutdown.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionActiveShutdown.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionOnConfigure.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionOnCleanup.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionOnActivate.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionOnDeactivate.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionOnShutdown.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionOnError.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionCallbackFailure.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionCallbackError.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum StateId.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum PrimaryStateActive.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionStateConfiguring.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionStateShuttingdown.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionStateDeactivating.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionStateErrorprocessing.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionId.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionActivate.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionUnconfiguredShutdown.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionActiveShutdown.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionOnConfigure.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionOnCleanup.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionOnActivate.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionOnDeactivate.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionOnShutdown.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionOnError.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionCallbackFailure.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum TransitionCallbackError.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class State already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Transition already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class TransitionDescription already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class TransitionEvent already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum LogLevel.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Error.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Fatal.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum LoggerLevelType.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum ParameterType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted State.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Transition.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionDescription.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TransitionEvent.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class State.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Transition.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class TransitionDescription.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class TransitionEvent.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum LogLevel already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum Error already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum Fatal already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum LoggerLevelType already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum ParameterType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class FloatingPointRange.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class IntegerRange.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ListParametersResult.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Log.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class LoggerLevel.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Parameter.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ParameterDescriptor.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ParameterEvent.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ParameterEventDescriptors.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ParameterValue.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class SetLoggerLevelsResult.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class SetParametersResult.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted LogLevel.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Error.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Fatal.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted LoggerLevelType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ParameterType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum LogLevel.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Error.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum Fatal.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum LoggerLevelType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum ParameterType.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class FloatingPointRange already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class IntegerRange already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class ListParametersResult already exists.\n",
@@ -451,58 +596,99 @@
       "INFO:capella_ros_tools.modules.capella.serializer:Class ParameterValue already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class SetLoggerLevelsResult already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class SetParametersResult already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Clock.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted FloatingPointRange.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted IntegerRange.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ListParametersResult.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Log.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted LoggerLevel.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Parameter.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ParameterDescriptor.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ParameterEvent.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ParameterEventDescriptors.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ParameterValue.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted SetLoggerLevelsResult.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted SetParametersResult.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class FloatingPointRange.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class IntegerRange.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ListParametersResult.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Log.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class LoggerLevel.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Parameter.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ParameterDescriptor.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ParameterEvent.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ParameterEventDescriptors.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ParameterValue.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class SetLoggerLevelsResult.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class SetParametersResult.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Clock already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum ServiceEventInfoEventType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Clock.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Clock.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum ServiceEventInfoEventType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ServiceEventInfo.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ServiceEventInfoEventType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum ServiceEventInfoEventType.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class ServiceEventInfo already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum StatisticDataType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ServiceEventInfo.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ServiceEventInfo.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum StatisticDataType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MetricsMessage.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class StatisticDataPoint.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted StatisticDataType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum StatisticDataType.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class MetricsMessage already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class StatisticDataPoint already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Builtins.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MetricsMessage.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted StatisticDataPoint.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MetricsMessage.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class StatisticDataPoint.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Builtins already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum FieldTypeTypeId 0.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum FieldType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Builtins.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Builtins.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldTypeTypeId 0 already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldType already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum FieldTypeByte.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum FieldTypeFixed.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum FieldTypeBounded.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldTypeByte already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldTypeFixed already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldTypeBounded already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldType already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted FieldTypeTypeId 0.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Deleted FieldType.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldTypeTypeId 0 already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted FieldTypeByte.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted FieldTypeFixed.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted FieldTypeBounded.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum FieldTypeTypeId 0.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Created enum FieldType.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldType already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldTypeByte already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum FieldTypeByte.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldTypeFixed already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldTypeBounded already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum FieldTypeFixed.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created enum FieldTypeBounded.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldType already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldType already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Enum FieldType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Field.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class FieldType.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class IndividualTypeDescription.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class KeyValue.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class TypeDescription.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class TypeSource.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Field already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class FieldType already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class IndividualTypeDescription already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class KeyValue already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class TypeDescription already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class TypeSource already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package unique_identifier_msgs.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class UUID.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Field.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted FieldType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted IndividualTypeDescription.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted KeyValue.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TypeDescription.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TypeSource.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Field.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class FieldType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class IndividualTypeDescription.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class KeyValue.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class TypeDescription.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class TypeSource.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class UUID already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted UUID.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class UUID.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Created properties for GoalID.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Created properties for GoalStatus.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Created properties for GoalStatusArray.\n",
@@ -653,36 +839,6 @@
       "INFO:capella_ros_tools.modules.capella.serializer:Created properties for TypeDescription.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Created properties for TypeSource.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Created properties for UUID.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package dsd_ros_messages.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package mission_control.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package sub_msg.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created package types.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class CoupledLocalization.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class CoupledLocalizationStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class CoupledLocalizationTupel.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class CoupledLocalizationTupelStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class EgoMotion.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class EgoMotionPath.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class EgoMotionPathStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class EgoMotionStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class GNSSLocalization.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class GNSSLocalizationStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class IMU.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class IMUStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MapMatchedLocalization.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MapMatchedLocalizationStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MapMatchedLocalizationTupel.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MapMatchedLocalizationTupelStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Objects.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ObjectsStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Odometry.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class OdometryStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class RailHorizon.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class RailHorizonStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class SensorInformation.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class SensorInformationStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class StaticObjects.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class StaticObjectsStamped.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class CoupledLocalization already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class CoupledLocalizationStamped already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class CoupledLocalizationTupel already exists.\n",
@@ -709,14 +865,58 @@
       "INFO:capella_ros_tools.modules.capella.serializer:Class SensorInformationStamped already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class StaticObjects already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class StaticObjectsStamped already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ApplicationConfiguration.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ApplicationConfigurationStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ApplicationStatus.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ApplicationStatusStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ApplicationVersion.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ApplicationVersionStamped.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MissionProfile.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MissionProfileStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted CoupledLocalization.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted CoupledLocalizationStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted CoupledLocalizationTupel.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted CoupledLocalizationTupelStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted EgoMotion.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted EgoMotionPath.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted EgoMotionPathStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted EgoMotionStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted GNSSLocalization.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted GNSSLocalizationStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted IMU.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted IMUStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MapMatchedLocalization.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MapMatchedLocalizationStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MapMatchedLocalizationTupel.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MapMatchedLocalizationTupelStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Objects.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ObjectsStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Odometry.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted OdometryStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted RailHorizon.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted RailHorizonStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted SensorInformation.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted SensorInformationStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted StaticObjects.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted StaticObjectsStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class CoupledLocalization.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class CoupledLocalizationStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class CoupledLocalizationTupel.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class CoupledLocalizationTupelStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class EgoMotion.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class EgoMotionPath.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class EgoMotionPathStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class EgoMotionStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class GNSSLocalization.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class GNSSLocalizationStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class IMU.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class IMUStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MapMatchedLocalization.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MapMatchedLocalizationStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MapMatchedLocalizationTupel.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MapMatchedLocalizationTupelStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Objects.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ObjectsStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Odometry.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class OdometryStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class RailHorizon.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class RailHorizonStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class SensorInformation.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class SensorInformationStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class StaticObjects.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class StaticObjectsStamped.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class ApplicationConfiguration already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class ApplicationConfigurationStamped already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class ApplicationStatus already exists.\n",
@@ -725,28 +925,22 @@
       "INFO:capella_ros_tools.modules.capella.serializer:Class ApplicationVersionStamped already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class MissionProfile already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class MissionProfileStamped already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Covariance.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class FieldOfView.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ID.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class KeyValueMap.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class KeyValuePair.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class LocalizationIntegrity.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class MapMatchingIntegrity.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Object.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ObjectBase.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ObjectClassification.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class ObjectTracking.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Orientation.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Position.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Probability.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class RailHorizonData.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class SensorInformationEntry.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class SensorIntegrity.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Shape.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Topology.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Track.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class TrackPoint.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created class Variance.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ApplicationConfiguration.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ApplicationConfigurationStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ApplicationStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ApplicationStatusStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ApplicationVersion.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ApplicationVersionStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MissionProfile.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MissionProfileStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ApplicationConfiguration.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ApplicationConfigurationStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ApplicationStatus.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ApplicationStatusStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ApplicationVersion.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ApplicationVersionStamped.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MissionProfile.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MissionProfileStamped.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Covariance already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class FieldOfView already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class ID already exists.\n",
@@ -769,6 +963,129 @@
       "INFO:capella_ros_tools.modules.capella.serializer:Class Track already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class TrackPoint already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Class Variance already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Covariance.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted FieldOfView.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ID.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted KeyValueMap.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted KeyValuePair.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted LocalizationIntegrity.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MapMatchingIntegrity.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Object.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ObjectBase.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ObjectClassification.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ObjectTracking.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Orientation.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Position.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Probability.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted RailHorizonData.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted SensorInformationEntry.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted SensorIntegrity.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Shape.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Topology.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Track.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TrackPoint.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted Variance.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Covariance.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class FieldOfView.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ID.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class KeyValueMap.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class KeyValuePair.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class LocalizationIntegrity.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class MapMatchingIntegrity.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Object.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ObjectBase.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ObjectClassification.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class ObjectTracking.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Orientation.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Position.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Probability.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class RailHorizonData.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class SensorInformationEntry.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class SensorIntegrity.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Shape.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Topology.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Track.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class TrackPoint.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Created class Variance.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ApplicationModeTypes already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ApplicationStatusType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ApplicationStatusSubTypeUnknown already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum LocalizationIntegrityType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum LocalizationIntegrityTypeMotion already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum LocalizationIntegrityTypePosition already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum LocalizationIntegrityTypeDirection already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum MapMatchingIntegrityType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum MapMatchingInvalidType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum MapMatchingOrientationTypes already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ObjectMotionType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum DynamicObjectType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum DynamicObjectTypePedestrianType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum StaticObjectClass already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum StaticObjectClassVerticalType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum StaticObjectClassBodyType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum StaticObjectClassPlaneType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum StaticObjectClassPlaneSubtype already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum StaticObjectClassCompositionType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum SensorIntegrityType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum SensorType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum SensorSubtype already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum SensorPosition already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum SensorSubposition already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypePlane already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeBox already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeCylinder already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeCone already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeVerticalStructureTopPoint already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeVerticalStructureBottomPoint already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeVerticalStructureWithRadiusTopPoint already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeVerticalStructureWithRadiusBottomPoint already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeHorizontalStructurePoint already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeBodyStructure already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypePlaneStructurePoint already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeComposedStructureId already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum TrackType already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Enum TrackSubtype already exists.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ApplicationModeTypes.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ApplicationStatusType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ApplicationStatusSubTypeUnknown.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted LocalizationIntegrityType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted LocalizationIntegrityTypeMotion.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted LocalizationIntegrityTypePosition.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted LocalizationIntegrityTypeDirection.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MapMatchingIntegrityType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MapMatchingInvalidType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted MapMatchingOrientationTypes.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ObjectMotionType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted DynamicObjectType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted DynamicObjectTypePedestrianType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted StaticObjectClass.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted StaticObjectClassVerticalType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted StaticObjectClassBodyType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted StaticObjectClassPlaneType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted StaticObjectClassPlaneSubtype.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted StaticObjectClassCompositionType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted SensorIntegrityType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted SensorType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted SensorSubtype.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted SensorPosition.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted SensorSubposition.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ShapeParameterIndicesTypePlane.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ShapeParameterIndicesTypeBox.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ShapeParameterIndicesTypeCylinder.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ShapeParameterIndicesTypeCone.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ShapeParameterIndicesTypeVerticalStructureTopPoint.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ShapeParameterIndicesTypeVerticalStructureBottomPoint.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ShapeParameterIndicesTypeVerticalStructureWithRadiusTopPoint.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ShapeParameterIndicesTypeVerticalStructureWithRadiusBottomPoint.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ShapeParameterIndicesTypeHorizontalStructurePoint.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ShapeParameterIndicesTypeBodyStructure.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ShapeParameterIndicesTypePlaneStructurePoint.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ShapeParameterIndicesTypeComposedStructureId.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ShapeType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TrackType.\n",
+      "INFO:capella_ros_tools.modules.capella.serializer:Deleted TrackSubtype.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Created enum ApplicationModeTypes.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Created enum ApplicationStatusType.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Created enum ApplicationStatusSubTypeUnknown.\n",
@@ -809,47 +1126,6 @@
       "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeType already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Created enum TrackType.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Created enum TrackSubtype.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Deleted ShapeType.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ApplicationModeTypes already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ApplicationStatusType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ApplicationStatusSubTypeUnknown already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum LocalizationIntegrityType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum LocalizationIntegrityTypeMotion already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum LocalizationIntegrityTypePosition already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum LocalizationIntegrityTypeDirection already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum MapMatchingIntegrityType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum MapMatchingInvalidType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum MapMatchingOrientationTypes already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ObjectMotionType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum DynamicObjectType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum DynamicObjectTypePedestrianType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum StaticObjectClass already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum StaticObjectClassVerticalType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum StaticObjectClassBodyType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum StaticObjectClassPlaneType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum StaticObjectClassPlaneSubtype already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum StaticObjectClassCompositionType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum SensorIntegrityType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum SensorType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum SensorSubtype already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum SensorPosition already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum SensorSubposition already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypePlane already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeBox already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeCylinder already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeCone already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeVerticalStructureTopPoint already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeVerticalStructureBottomPoint already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeVerticalStructureWithRadiusTopPoint already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeVerticalStructureWithRadiusBottomPoint already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeHorizontalStructurePoint already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeBodyStructure already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypePlaneStructurePoint already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeParameterIndicesTypeComposedStructureId already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Created enum ShapeType.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum ShapeType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum TrackType already exists.\n",
-      "INFO:capella_ros_tools.modules.capella.serializer:Enum TrackSubtype already exists.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Created properties for CoupledLocalization.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Created properties for CoupledLocalizationStamped.\n",
       "INFO:capella_ros_tools.modules.capella.serializer:Created properties for CoupledLocalizationTupel.\n",
diff --git a/docs/source/howtos/howtos.rst b/docs/source/howtos/howtos.rst
index fcff646..70e24dc 100644
--- a/docs/source/howtos/howtos.rst
+++ b/docs/source/howtos/howtos.rst
@@ -29,7 +29,7 @@ Export Capella Model (experimental):
 ------------------------------------
 .. code-block:: bash
 
-   $ python -m capella_ros_tools export docs/source/examples/data/melody_model_60 la docs/source/examples/data/example_msgs
+   $ python -m capella_ros_tools export docs/source/examples/data/melody_model_60 la docs/source/examples/data/melody_msgs
 
 Export Capella Model from Git Repository (experimental):
 --------------------------------------------------------
diff --git a/docs/source/messages/messages.rst b/docs/source/messages/messages.rst
index 41eb1cf..d4920db 100644
--- a/docs/source/messages/messages.rst
+++ b/docs/source/messages/messages.rst
@@ -10,8 +10,15 @@ ROS2 Message Layout
 
 The Capella ROS Tools API expects ROS2 messages to be organized in a specific way:
 
-Class definition
-=================
+Class Definition
+================
+* A `.msg` file can contain one class definition.
+* Comments at the top of the file are appended to the class description.
+* **Inline Comments:** Comments on the same line as a property definition are directly appended to that property's description.
+* **Indented Comment Lines:** Comments on a line of their own but indented are appended to the description of the last encountered property.
+* **Block Comments:** Comments on a line of their own and not indented are prepended to the description of the next properties until an empty line or a new block comment is encountered.
+* **Unused Comments:** If a block comment has no properties after it before the next empty line or block comment, it is added to the class description itself.
+
 .. code-block:: python
    :linenos:
 
@@ -28,26 +35,36 @@ Class definition
 
    # This block comment is appended to the
    # property description of my_other_field.
-   uint8 my_other_field     # This inline comment
-                            # is appended to the
-                            # property description of
-                            # my_other_field.
+   uint8 my_other_field    # This inline comment
+                           # is appended to the
+                           # property description of
+                           # my_other_field.
 
    uint8 my_third_field
 
 Enum definition
 ===============
+* A `.msg` file can contain multiple enum definitions.
+* Multiple enum definitions are separated by an empty line.
+* Enum names are determined based on the longest common prefix of all enum values in the definition.
+* If no common prefix exists, the enum name is derived from the file name (excluding the extension).
+* Only one or no enum should have value names without a common prefix.
+* Comments at the top of the file and unused comments are ignored.
+* **Inline Comments:** Comments on the same line as an enum value definition are directly appended to the that enum value's description.
+* **Indented Comment Lines:** Comments on a line of their own but indented are appended to the description of the last encountered enum value.
+* **Block Comments:** Comments on a line of their own and not indented are prepended to the description of the next enum definition.
+
 .. code-block:: python
    :linenos:
 
    # MyEnum.msg
    # This block comment is appended to the
-   # enum description of MyEnumMyEnumValue.
-   uint8 MY_ENUM_VALUE_RED = 0
-   uint8 MY_ENUM_VALUE_BLUE = 1    # This inline comment is
-                                   # appended to the
-                                   # enum value description
-                                   # of BLUE.
+   # enum description of MyEnumValue.
+   uint8 MY_ENUM_VALUE_RED    = 0
+   uint8 MY_ENUM_VALUE_BLUE   = 1   # This inline comment is
+                                    # appended to the
+                                    # enum value description
+                                    # of BLUE.
    uint8 MY_ENUM_VALUE_YELLOW = 2
 
    # This block comment is appended to the
@@ -59,8 +76,17 @@ Enum definition
    byte ERROR  = 2
    byte STALE  = 3
 
-Enum and class definition
+Enum and Class Definition
 =========================
+* A `.msg` file can contain one class definition and multiple enum definitions.
+* Enums without a common value name prefix are named using the file name plus the suffix "Type."
+* There can only be one or no enum whose value names do not share a common prefix.
+* Comments at the top of the file are appended to the class description.
+* **Inline Comments:** Comments on the same line as a property or enum value are directly appended to the description of that element.
+* **Indented Comment Lines:** Comments on a line of their own but indented are appended to the description of the last encountered property or enum value.
+* **Block Comments:** Comments on a line of their own and not indented are prepended to the description of the next properties or enum until an empty line or a new block comment is encountered.
+* **Unused Comments:** If a block comment has no following properties or enums before the next empty line or block comment, it is added to the class description.
+
 .. code-block:: python
    :linenos:
 
@@ -80,33 +106,46 @@ Enum and class definition
 Referencing enums
 =================
 
-In the same file
+In the Same File
 ----------------
+*  In files that define a class along with enums, the class properties can reference enums defined in the same file. This can be achieved in two ways:
+
+   * **Name Match:** The property name matches the enum name.
+   * **Type Match:** The property type matches the enum values type, in which case the updated enum name is derived from the file name plus the property name.
+
+*  Name matching takes precedence over type matching.
+
 .. code-block:: python
    :linenos:
 
    # MyMessage.msg
-   # Fields in MyMessage can reference enums in the same file.
+   # Properties in MyMessage can reference enums in the same file.
 
    # This block comment is appended to the
-   # enum description of MyMessageType.
+   # enum description of MyMessageStatus.
    byte OK     = 0
    byte WARN   = 1
    byte ERROR  = 2
    byte STALE  = 3
 
    # This block comment is appended to the
-   # enum description of MyMessageColor.
-   byte COLOR_RED     = 0
+   # enum description of Color.
+   byte COLOR_RED    = 0
    byte COLOR_BLUE   = 1
-   byte COLOR_YELLOW  = 2
+   byte COLOR_YELLOW = 2
 
-   byte my_field  # The property my_field is of type MyMessageType
-   uint8 color    # The property color is of type MyMessageColor
+   byte status  # The property status is of type MyMessageStatus
+   byte color    # The property color is of type Color
 
 
 In another file
 ---------------
+*  If a property definition has a primitive type, it searches for a reference to an enum in the comments and updates the type of the property based on this reference.
+*  The reference should be follow either of the following formats:
+
+   * **cf. <File Name>:** The enum name is derived from the file name (excluding the extension).
+   * **cf. <File Name>, <Common Prefix>_XXX:** The enum name is derived from the longest common prefix of all enum values in the definition.
+
 .. code-block:: python
    :linenos:
 
@@ -119,7 +158,7 @@ In another file
    byte STALE  = 3
 
    # This block comment is appended to the
-   # enum description of MyEnumMyEnumValue.
+   # enum description of MyEnumValue.
    uint8 MY_ENUM_VALUE_1 = 0
    uint8 MY_ENUM_VALUE_2 = 1
    uint8 MY_ENUM_VALUE_3 = 2
diff --git a/docs/source/usage/usage.rst b/docs/source/usage/usage.rst
index 15c3b91..e17ce26 100644
--- a/docs/source/usage/usage.rst
+++ b/docs/source/usage/usage.rst
@@ -16,16 +16,18 @@ Import ROS2 Messages:
 
    $ python -m capella_ros_tools import <ROS_MESSAGES_PATH> <CAPELLA_MODEL_PATH> <CAPELLA_MODEL_LAYER> --port=<PORT> --exists-action=<EXISTS_ACTION> --no-deps
 
-* "<ROS_MESSAGES_PATH>", import ROS2 messages from <ROS_MESSAGES_PATH>
-* "<CAPELLA_MODEL_PATH>", export to Capella model <CAPELLA_MODEL_PATH>
-* "<CAPELLA_MODEL_LAYER>", use Capella model layer <CAPELLA_MODEL_LAYER>
-* "--port=<PORT>", start Capella model server at <PORT> (optional)
-* "--exists-action=<EXISTS_ACTION>", action to take if a Capella element already exists (optional)
-   * "skip", skip elements
-   * "replace", replace elements
-   * "abort", abort import
-   * "ask", ask the user (default)
-* "--no-deps", do not import ROS2 dependencies (e.g. std_msgs)
+*  **<ROS_MESSAGES_PATH>**, import ROS2 messages from <ROS_MESSAGES_PATH>
+*  **<CAPELLA_MODEL_PATH>**, export to Capella model <CAPELLA_MODEL_PATH>
+*  **<CAPELLA_MODEL_LAYER>**, use Capella model layer <CAPELLA_MODEL_LAYER>
+*  **--port=<PORT>**, start Capella model server at <PORT> (optional)
+*  **--exists-action=<EXISTS_ACTION>**, action to take if a Capella element already exists (optional)
+
+   * **skip**, skip elements
+   * **replace**, replace elements
+   * **abort**, abort import
+   * **ask**, ask the user (default)
+
+*  **--no-deps**, do not import ROS2 dependencies (e.g. std_msgs)
 
 Export Capella Model (experimental):
 ------------------------------------
@@ -33,6 +35,6 @@ Export Capella Model (experimental):
 
    $ python -m capella_ros_tools export <CAPELLA_MODEL_PATH> <CAPELLA_MODEL_LAYER> <ROS_MESSAGES_PATH>
 
-* "<CAPELLA_MODEL_PATH>", import Capella model from <CAPELLA_MODEL_PATH>
-* "<CAPELLA_MODEL_LAYER>", use Capella model layer <CAPELLA_MODEL_LAYER>
-* "<ROS_MESSAGES_PATH>", export ROS2 messages to <ROS_MESSAGES_PATH>
+* **<CAPELLA_MODEL_PATH>**, import Capella model from <CAPELLA_MODEL_PATH>
+* **<CAPELLA_MODEL_LAYER>**, use Capella model layer <CAPELLA_MODEL_LAYER>
+* **<ROS_MESSAGES_PATH>**, export ROS2 messages to <ROS_MESSAGES_PATH>