diff --git a/tracetools_analysis/analysis/callback_duration.ipynb b/tracetools_analysis/analysis/callback_duration.ipynb
index 7922044..a4e3b7b 100644
--- a/tracetools_analysis/analysis/callback_duration.ipynb
+++ b/tracetools_analysis/analysis/callback_duration.ipynb
@@ -64,8 +64,7 @@
     "# Process\n",
     "events = load_pickle(pickle_path)\n",
     "handler = Ros2Handler.process(events)\n",
-    "data_model = handler.get_data_model()\n",
-    "#data_model.print_model()"
+    "#handler.data.print_model()"
    ]
   },
   {
@@ -546,7 +545,7 @@
     }
    ],
    "source": [
-    "data_util = utils.RosDataModelUtil(data_model)\n",
+    "data_util = utils.RosDataModelUtil(handler.data)\n",
     "\n",
     "callback_symbols = data_util.get_callback_symbols()\n",
     "\n",
diff --git a/tracetools_analysis/analysis/profile.ipynb b/tracetools_analysis/analysis/profile.ipynb
index 95b0630..4fc8d91 100644
--- a/tracetools_analysis/analysis/profile.ipynb
+++ b/tracetools_analysis/analysis/profile.ipynb
@@ -69,9 +69,7 @@
     "profile_handler = ProfileHandler()\n",
     "ros_handler = Ros2Handler()\n",
     "processor = Processor(profile_handler, ros_handler)\n",
-    "processor.process(events)\n",
-    "data_model = profile_handler.get_data_model()\n",
-    "#data_model.print_model()"
+    "processor.process(events)"
    ]
   },
   {
@@ -80,8 +78,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "data_util = utils.ProfileDataModelUtil(data_model)\n",
-    "ros_data_util = utils.RosDataModelUtil(ros_handler.get_data_model())\n",
+    "data_util = utils.ProfileDataModelUtil(profile_handler.data)\n",
+    "ros_data_util = utils.RosDataModelUtil(ros_handler.data)\n",
     "\n",
     "output_notebook()\n",
     "psize = 450\n",