diff --git a/ros2trace_analysis/ros2trace_analysis/command/trace_analysis.py b/ros2trace_analysis/ros2trace_analysis/command/trace_analysis.py
index 0ae2f1f..8fabd52 100644
--- a/ros2trace_analysis/ros2trace_analysis/command/trace_analysis.py
+++ b/ros2trace_analysis/ros2trace_analysis/command/trace_analysis.py
@@ -14,9 +14,8 @@
 
 """Module for trace analysis command extension implementation."""
 
-from ros2cli.command import add_subparsers
+from ros2cli.command import add_subparsers_on_demand
 from ros2cli.command import CommandExtension
-from ros2cli.verb import get_verb_extensions
 
 
 class TraceAnalysisCommand(CommandExtension):
@@ -25,9 +24,8 @@ class TraceAnalysisCommand(CommandExtension):
     def add_arguments(self, parser, cli_name):
         self._subparser = parser
         # get verb extensions and let them add their arguments
-        verb_extensions = get_verb_extensions('ros2trace_analysis.verb')
-        add_subparsers(
-            parser, cli_name, '_verb', verb_extensions, required=False)
+        add_subparsers_on_demand(
+            parser, cli_name, '_verb', 'ros2trace_analysis.verb', required=False)
 
     def main(self, *, parser, args):
         if not hasattr(args, '_verb'):