diff --git a/docs/getting_started/die.html b/docs/getting_started/die.html
index 7243e1d..2111815 100644
--- a/docs/getting_started/die.html
+++ b/docs/getting_started/die.html
@@ -1,6 +1,6 @@
 
           <iframe
-                id="dieeQbbbtTbpv"
+                id="diezvSItfhbCB"
                 width="820"
                 height="620"
                 frameborder="0"
diff --git a/docs/getting_started/die.ipynb b/docs/getting_started/die.ipynb
index 5ce68a6..7695724 100644
--- a/docs/getting_started/die.ipynb
+++ b/docs/getting_started/die.ipynb
@@ -9,7 +9,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 6,
+      "execution_count": 1,
       "metadata": {},
       "outputs": [],
       "source": [
@@ -29,7 +29,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 7,
+      "execution_count": 2,
       "metadata": {
         "scrolled": true
       },
@@ -39,7 +39,7 @@
             "text/html": [
               "\n",
               "          <iframe\n",
-              "                id=\"dieeQbbbtTbpv\"\n",
+              "                id=\"diezvSItfhbCB\"\n",
               "                width=\"820\"\n",
               "                height=\"620\"\n",
               "                frameborder=\"0\"\n",
@@ -306,7 +306,7 @@
       "name": "python",
       "nbconvert_exporter": "python",
       "pygments_lexer": "ipython3",
-      "version": "3.11.2"
+      "version": "3.12.7"
     },
     "widgets": {
       "application/vnd.jupyter.widget-state+json": {
diff --git a/docs/getting_started/mdp.ipynb b/docs/getting_started/mdp.ipynb
index 0146b10..90c7950 100644
--- a/docs/getting_started/mdp.ipynb
+++ b/docs/getting_started/mdp.ipynb
@@ -18,7 +18,7 @@
         {
           "data": {
             "text/plain": [
-              "<stormpy.storage.storage.PrismProgram at 0x7f2e35d75eb0>"
+              "<stormpy.storage.storage.PrismProgram at 0x7fb379fafb30>"
             ]
           },
           "execution_count": 2,
@@ -275,7 +275,7 @@
         {
           "data": {
             "application/vnd.jupyter.widget-view+json": {
-              "model_id": "997d4600f467461ea1373a3ada686982",
+              "model_id": "f113a3bb73e541179bb0eb95c0cacbb4",
               "version_major": 2,
               "version_minor": 0
             },
@@ -285,44 +285,6 @@
           },
           "metadata": {},
           "output_type": "display_data"
-        },
-        {
-          "data": {
-            "text/html": [
-              "<script>fetch('http://127.0.0.1:8889/GqsIRIDxdP/MESSAGE/' + 'test message')</script>"
-            ],
-            "text/plain": [
-              "<IPython.core.display.HTML object>"
-            ]
-          },
-          "metadata": {},
-          "output_type": "display_data"
-        },
-        {
-          "data": {
-            "text/html": [
-              "<script>fetch('http://127.0.0.1:8889/GqsIRIDxdP/MESSAGE/' + 'test message')</script>"
-            ],
-            "text/plain": [
-              "<IPython.core.display.HTML object>"
-            ]
-          },
-          "metadata": {},
-          "output_type": "display_data"
-        },
-        {
-          "data": {
-            "application/vnd.jupyter.widget-view+json": {
-              "model_id": "f45b2ef528d34e9fadcd1202511779a3",
-              "version_major": 2,
-              "version_minor": 0
-            },
-            "text/plain": [
-              "HBox(children=(Output(), Output()))"
-            ]
-          },
-          "metadata": {},
-          "output_type": "display_data"
         }
       ],
       "source": [
@@ -347,341 +309,13 @@
       "outputs": [
         {
           "data": {
-            "text/html": [
-              "\n",
-              "<!DOCTYPE html>\n",
-              "<html lang=\"en\">\n",
-              "  <head>\n",
-              "    <title>Network</title>\n",
-              "    <script\n",
-              "      type=\"text/javascript\"\n",
-              "      src=\"https://unpkg.com/vis-network/standalone/umd/vis-network.min.js\"\n",
-              "    ></script>\n",
-              "    <style type=\"text/css\">\n",
-              "      #mynetwork {\n",
-              "        \n",
-              "        width: 800px;\n",
-              "        height: 600px;\n",
-              "        border: 1px solid lightgray;\n",
-              "        \n",
-              "      }\n",
-              "    </style>\n",
-              "  </head>\n",
-              "  <body>\n",
-              "    <div id=\"mynetwork\"></div>\n",
-              "    <script type=\"text/javascript\">\n",
-              "        \n",
-              "        var nodes = new vis.DataSet([{ id: 0, label: `init\n",
-              "rounds: 0.0`, group: \"states\" },\n",
-              "{ id: 1, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 2, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 3, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 4, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 5, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 6, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 7, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 8, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 9, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 10, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 11, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 12, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 13, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 14, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 15, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 16, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 17, label: `\n",
-              "rounds: 1.0`, group: \"states\", hidden: true },\n",
-              "{ id: 18, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 19, label: `\n",
-              "rounds: 1.0`, group: \"states\", hidden: true },\n",
-              "{ id: 20, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 21, label: `\n",
-              "rounds: 1.0`, group: \"states\", hidden: true },\n",
-              "{ id: 22, label: `\n",
-              "rounds: 1.0`, group: \"states\", hidden: true },\n",
-              "{ id: 23, label: `\n",
-              "rounds: 1.0`, group: \"states\", hidden: true },\n",
-              "{ id: 24, label: `\n",
-              "rounds: 1.0`, group: \"states\", hidden: true },\n",
-              "{ id: 25, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 26, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 27, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 28, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 29, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 30, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 31, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 32, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 33, label: `\n",
-              "rounds: 1.0`, group: \"states\", hidden: true },\n",
-              "{ id: 34, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 35, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 36, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 37, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 38, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 39, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 40, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 41, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 42, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 43, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 44, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 45, label: `\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 46, label: `deadlock\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 47, label: `deadlock\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "{ id: 48, label: `deadlock\n",
-              "rounds: 0.0`, group: \"states\", hidden: true },\n",
-              "]);\n",
-              "        var edges = new vis.DataSet([{ from: 0, to: 1, label: \"1/8\" },\n",
-              "{ from: 0, to: 2, label: \"1/8\" },\n",
-              "{ from: 0, to: 3, label: \"1/8\" },\n",
-              "{ from: 0, to: 4, label: \"1/8\" },\n",
-              "{ from: 0, to: 5, label: \"1/8\" },\n",
-              "{ from: 0, to: 6, label: \"1/8\" },\n",
-              "{ from: 0, to: 7, label: \"1/8\" },\n",
-              "{ from: 0, to: 8, label: \"1/8\" },\n",
-              "{ from: 1, to: 9, label: \"1\" },\n",
-              "{ from: 2, to: 10, label: \"1\" },\n",
-              "{ from: 3, to: 11, label: \"1\" },\n",
-              "{ from: 4, to: 12, label: \"1\" },\n",
-              "{ from: 5, to: 13, label: \"1\" },\n",
-              "{ from: 6, to: 14, label: \"1\" },\n",
-              "{ from: 7, to: 15, label: \"1\" },\n",
-              "{ from: 8, to: 16, label: \"1\" },\n",
-              "{ from: 9, to: 17, label: \"1\" },\n",
-              "{ from: 10, to: 18, label: \"1\" },\n",
-              "{ from: 11, to: 19, label: \"1\" },\n",
-              "{ from: 12, to: 20, label: \"1\" },\n",
-              "{ from: 13, to: 21, label: \"1\" },\n",
-              "{ from: 14, to: 22, label: \"1\" },\n",
-              "{ from: 15, to: 23, label: \"1\" },\n",
-              "{ from: 16, to: 24, label: \"1\" },\n",
-              "{ from: 17, to: 25, label: \"1\" },\n",
-              "{ from: 18, to: 26, label: \"1\" },\n",
-              "{ from: 19, to: 27, label: \"1\" },\n",
-              "{ from: 20, to: 26, label: \"1\" },\n",
-              "{ from: 21, to: 28, label: \"1\" },\n",
-              "{ from: 22, to: 29, label: \"1\" },\n",
-              "{ from: 23, to: 30, label: \"1\" },\n",
-              "{ from: 24, to: 31, label: \"1\" },\n",
-              "{ from: 25, to: 32, label: \"1\" },\n",
-              "{ from: 26, to: 33, label: \"1\" },\n",
-              "{ from: 27, to: 34, label: \"1\" },\n",
-              "{ from: 28, to: 35, label: \"1\" },\n",
-              "{ from: 29, to: 36, label: \"1\" },\n",
-              "{ from: 30, to: 37, label: \"1\" },\n",
-              "{ from: 31, to: 38, label: \"1\" },\n",
-              "{ from: 32, to: 39, label: \"1\" },\n",
-              "{ from: 33, to: 40, label: \"1\" },\n",
-              "{ from: 34, to: 41, label: \"1\" },\n",
-              "{ from: 35, to: 42, label: \"1\" },\n",
-              "{ from: 36, to: 43, label: \"1\" },\n",
-              "{ from: 37, to: 44, label: \"1\" },\n",
-              "{ from: 38, to: 45, label: \"1\" },\n",
-              "{ from: 39, to: 0, label: \"1\" },\n",
-              "{ from: 40, to: 46, label: \"1\" },\n",
-              "{ from: 41, to: 47, label: \"1\" },\n",
-              "{ from: 42, to: 48, label: \"1\" },\n",
-              "{ from: 43, to: 48, label: \"1\" },\n",
-              "{ from: 44, to: 47, label: \"1\" },\n",
-              "{ from: 45, to: 0, label: \"1\" },\n",
-              "{ from: 46, to: 46, label: \"1\" },\n",
-              "{ from: 47, to: 47, label: \"1\" },\n",
-              "{ from: 48, to: 48, label: \"1\" },\n",
-              "]);\n",
-              "        var options = {\n",
-              "  \"__fake_macros\": {\n",
-              "    \"__group_macro\": {\n",
-              "      \"borderWidth\": 1,\n",
-              "      \"color\": {\n",
-              "        \"background\": \"white\",\n",
-              "        \"border\": \"black\",\n",
-              "        \"highlight\": {\n",
-              "          \"background\": \"white\",\n",
-              "          \"border\": \"red\"\n",
-              "        }\n",
-              "      },\n",
-              "      \"shape\": \"ellipse\",\n",
-              "      \"mass\": 1,\n",
-              "      \"font\": {\n",
-              "        \"color\": \"black\",\n",
-              "        \"size\": 14\n",
-              "      }\n",
-              "    }\n",
-              "  },\n",
-              "  \"groups\": {\n",
-              "    \"states\": {\n",
-              "      \"borderWidth\": 1,\n",
-              "      \"color\": {\n",
-              "        \"background\": \"white\",\n",
-              "        \"border\": \"black\",\n",
-              "        \"highlight\": {\n",
-              "          \"background\": \"white\",\n",
-              "          \"border\": \"red\"\n",
-              "        }\n",
-              "      },\n",
-              "      \"shape\": \"ellipse\",\n",
-              "      \"mass\": 1,\n",
-              "      \"font\": {\n",
-              "        \"color\": \"black\",\n",
-              "        \"size\": 14\n",
-              "      }\n",
-              "    },\n",
-              "    \"actions\": {\n",
-              "      \"borderWidth\": 1,\n",
-              "      \"color\": {\n",
-              "        \"background\": \"lightblue\",\n",
-              "        \"border\": \"black\",\n",
-              "        \"highlight\": {\n",
-              "          \"background\": \"white\",\n",
-              "          \"border\": \"red\"\n",
-              "        }\n",
-              "      },\n",
-              "      \"shape\": \"box\",\n",
-              "      \"mass\": 1,\n",
-              "      \"font\": {\n",
-              "        \"color\": \"black\",\n",
-              "        \"size\": 14\n",
-              "      }\n",
-              "    },\n",
-              "    \"scheduled_actions\": {\n",
-              "      \"borderWidth\": 1,\n",
-              "      \"color\": {\n",
-              "        \"background\": \"pink\",\n",
-              "        \"border\": \"black\",\n",
-              "        \"highlight\": {\n",
-              "          \"background\": \"white\",\n",
-              "          \"border\": \"red\"\n",
-              "        }\n",
-              "      },\n",
-              "      \"shape\": \"box\",\n",
-              "      \"mass\": 1,\n",
-              "      \"font\": {\n",
-              "        \"color\": \"black\",\n",
-              "        \"size\": 14\n",
-              "      },\n",
-              "      \"schedColor\": false\n",
-              "    }\n",
-              "  },\n",
-              "  \"reload_button\": false,\n",
-              "  \"edges\": {\n",
-              "    \"arrows\": \"to\",\n",
-              "    \"font\": {\n",
-              "      \"color\": \"black\",\n",
-              "      \"size\": 14\n",
-              "    },\n",
-              "    \"color\": {\n",
-              "      \"color\": \"black\"\n",
-              "    }\n",
-              "  },\n",
-              "  \"numbers\": {\n",
-              "    \"fractions\": true,\n",
-              "    \"digits\": 5\n",
-              "  },\n",
-              "  \"results_and_rewards\": {\n",
-              "    \"show_results\": true,\n",
-              "    \"resultSymbol\": \"\\u2606\",\n",
-              "    \"show_rewards\": true\n",
-              "  },\n",
-              "  \"layout\": {\n",
-              "    \"randomSeed\": 5\n",
-              "  },\n",
-              "  \"misc\": {\n",
-              "    \"enable_physics\": true,\n",
-              "    \"width\": 800,\n",
-              "    \"height\": 600,\n",
-              "    \"explore\": true\n",
-              "  },\n",
-              "  \"saving\": {\n",
-              "    \"relative_path\": true,\n",
-              "    \"filename\": \"layouts/NAME.json\",\n",
-              "    \"save_button\": false,\n",
-              "    \"load_button\": false\n",
-              "  },\n",
-              "  \"positions\": {},\n",
-              "  \"width\": 800,\n",
-              "  \"height\": 600,\n",
-              "  \"physics\": true\n",
-              "};\n",
-              "        //js\n",
-              "var container = document.getElementById(\"mynetwork\");\n",
-              "var data = {\n",
-              "    nodes: nodes,\n",
-              "    edges: edges,\n",
-              "};\n",
-              "var network = new vis.Network(container, data, options);\n",
-              "function makeAllNodesInvisible() {\n",
-              "    ids = nodes.getIds();\n",
-              "    for (let i = 0; i < ids.length; i++) {\n",
-              "        var nodeId = ids[i];\n",
-              "        var node = nodes.get(nodeId);\n",
-              "        node[\"hidden\"] = true;\n",
-              "        nodes.update(node);\n",
-              "    }\n",
-              "};\n",
-              "function makeNeighborsVisible(myNode) {\n",
-              "    var ids = network.getConnectedNodes(myNode, 'to');\n",
-              "    for (let i = 0; i < ids.length; i++) {\n",
-              "        var nodeId = ids[i];\n",
-              "        var node = nodes.get(nodeId);\n",
-              "        node[\"hidden\"] = false;\n",
-              "        nodes.update(node);\n",
-              "    }\n",
-              "};\n",
-              "function makeNodeVisible(nodeId) {\n",
-              "    var node = nodes.get(nodeId);\n",
-              "    node[\"hidden\"] = false;\n",
-              "    nodes.update(node);\n",
-              "};\n",
-              "network.on( 'click', function(properties) {\n",
-              "    var nodeId = network.getNodeAt({x:properties.event.srcEvent.offsetX, y:properties.event.srcEvent.offsetY});\n",
-              "    makeNeighborsVisible(nodeId);\n",
-              "});\n",
-              "\n",
-              "    </script>\n",
-              "  </body>\n",
-              "</html>\n"
-            ],
+            "application/vnd.jupyter.widget-view+json": {
+              "model_id": "8d832d9188a642f0aeb3b4b740eb1006",
+              "version_major": 2,
+              "version_minor": 0
+            },
             "text/plain": [
-              "<IPython.core.display.HTML object>"
+              "Output()"
             ]
           },
           "metadata": {},
@@ -716,9 +350,9 @@
   ],
   "metadata": {
     "kernelspec": {
-      "display_name": "Python (stormvogel)",
+      "display_name": "Python 3 (ipykernel)",
       "language": "python",
-      "name": "stormvogel-env"
+      "name": "python3"
     },
     "language_info": {
       "codemirror_mode": {
diff --git a/docs/getting_started/study.html b/docs/getting_started/study.html
index c5d78df..5a795e6 100644
--- a/docs/getting_started/study.html
+++ b/docs/getting_started/study.html
@@ -1,6 +1,6 @@
 
           <iframe
-                id="studyJItnPUbGyS"
+                id="studyQvPbMkPXdR"
                 width="820"
                 height="620"
                 frameborder="0"
diff --git a/stormvogel/mapping.py b/stormvogel/mapping.py
index 110db3a..565670c 100644
--- a/stormvogel/mapping.py
+++ b/stormvogel/mapping.py
@@ -324,6 +324,7 @@ def add_states(
         """
         helper function to add the states from the sparsemodel to the model
         """
+        model.new_state()
         for state in sparsemodel.states:
             if state.id == 0:
                 for label in state.labels:
@@ -357,7 +358,7 @@ def map_dtmc(sparsedtmc: stormpy.storage.SparseDtmc) -> stormvogel.model.Model:
         """
 
         # we create the model (it seems names are not stored in sparsedtmcs)
-        model = stormvogel.model.new_dtmc(name=None)
+        model = stormvogel.model.new_dtmc(name=None, create_initial_state=False)
 
         # we add the states
         add_states(model, sparsedtmc)
@@ -388,7 +389,7 @@ def map_mdp(sparsemdp: stormpy.storage.SparseDtmc) -> stormvogel.model.Model:
         """
 
         # we create the model
-        model = stormvogel.model.new_mdp(name=None)
+        model = stormvogel.model.new_mdp(name=None, create_initial_state=False)
 
         # we add the states
         add_states(model, sparsemdp)
@@ -430,7 +431,7 @@ def map_ctmc(sparsectmc: stormpy.storage.SparseCtmc) -> stormvogel.model.Model:
         """
 
         # we create the model (it seems names are not stored in sparsectmcs)
-        model = stormvogel.model.new_ctmc(name=None)
+        model = stormvogel.model.new_ctmc(name=None, create_initial_state=False)
 
         # we add the states
         add_states(model, sparsectmc)
@@ -465,7 +466,7 @@ def map_pomdp(sparsepomdp: stormpy.storage.SparsePomdp) -> stormvogel.model.Mode
         """
 
         # we create the model (it seems names are not stored in sparsepomdps)
-        model = stormvogel.model.new_pomdp(name=None)
+        model = stormvogel.model.new_pomdp(name=None, create_initial_state=False)
 
         # we add the states
         add_states(model, sparsepomdp)
@@ -511,7 +512,7 @@ def map_ma(sparsema: stormpy.storage.SparseMA) -> stormvogel.model.Model:
         """
 
         # we create the model (it seems names are not stored in sparsemas)
-        model = stormvogel.model.new_ma(name=None)
+        model = stormvogel.model.new_ma(name=None, create_initial_state=False)
 
         # we add the states
         add_states(model, sparsema)
diff --git a/stormvogel/model.py b/stormvogel/model.py
index 1f7da00..5cfc4a2 100644
--- a/stormvogel/model.py
+++ b/stormvogel/model.py
@@ -359,7 +359,9 @@ class Model:
     # In ma's we keep track of markovian states
     markovian_states: list[State] | None
 
-    def __init__(self, name: str | None, model_type: ModelType):
+    def __init__(
+        self, name: str | None, model_type: ModelType, create_initial_state: bool = True
+    ):
         self.name = name
         self.type = model_type
         self.transitions = {}
@@ -391,7 +393,8 @@ def __init__(self, name: str | None, model_type: ModelType):
             self.markovian_states = None
 
         # Add the initial state
-        self.new_state(["init"])
+        if create_initial_state:
+            self.new_state(["init"])
 
     def supports_actions(self):
         """Returns whether this model supports actions."""
@@ -853,31 +856,33 @@ def __eq__(self, other):
         return False
 
 
-def new_dtmc(name: str | None = None):
+def new_dtmc(name: str | None = None, create_initial_state: bool = True):
     """Creates a DTMC."""
-    return Model(name, ModelType.DTMC)
+    return Model(name, ModelType.DTMC, create_initial_state)
 
 
-def new_mdp(name: str | None = None):
+def new_mdp(name: str | None = None, create_initial_state: bool = True):
     """Creates an MDP."""
-    return Model(name, ModelType.MDP)
+    return Model(name, ModelType.MDP, create_initial_state)
 
 
-def new_ctmc(name: str | None = None):
+def new_ctmc(name: str | None = None, create_initial_state: bool = True):
     """Creates a CTMC."""
-    return Model(name, ModelType.CTMC)
+    return Model(name, ModelType.CTMC, create_initial_state)
 
 
-def new_pomdp(name: str | None = None):
+def new_pomdp(name: str | None = None, create_initial_state: bool = True):
     """Creates a POMDP."""
-    return Model(name, ModelType.POMDP)
+    return Model(name, ModelType.POMDP, create_initial_state)
 
 
-def new_ma(name: str | None = None):
+def new_ma(name: str | None = None, create_initial_state: bool = True):
     """Creates a MA."""
-    return Model(name, ModelType.MA)
+    return Model(name, ModelType.MA, create_initial_state)
 
 
-def new_model(modeltype: ModelType, name: str | None = None):
+def new_model(
+    modeltype: ModelType, name: str | None = None, create_initial_state: bool = True
+):
     """More general model creation function"""
-    return Model(name, modeltype)
+    return Model(name, modeltype, create_initial_state)
diff --git a/tests/test_mapping.py b/tests/test_mapping.py
index 847178f..b2a70e0 100644
--- a/tests/test_mapping.py
+++ b/tests/test_mapping.py
@@ -102,8 +102,6 @@ def test_stormpy_to_stormvogel_and_back_dtmc():
     new_stormpy_dtmc = stormvogel.mapping.stormvogel_to_stormpy(stormvogel_dtmc)
     # print(new_stormpy_dtmc.transition_matrix)
 
-    # TODO also compare other parts than the matrix (e.g. state labels)
-
     assert sparse_equal(stormpy_dtmc, new_stormpy_dtmc)
 
 
@@ -138,7 +136,6 @@ def test_stormpy_to_stormvogel_and_back_mdp():
     new_stormpy_mdp = stormvogel.mapping.stormvogel_to_stormpy(stormvogel_mdp)
     # print(new_stormpy_mdp)
 
-    # TODO also compare other parts than the matrix (e.g. choice labels)
     assert sparse_equal(stormpy_mdp, new_stormpy_mdp)
 
 
