diff --git a/.docker/compose.yml b/.docker/compose.yml
index 0d680c5fa..2405ad9c2 100644
--- a/.docker/compose.yml
+++ b/.docker/compose.yml
@@ -2,10 +2,10 @@ version: '2'
 
 services:
   qgis:
-    image: qgis/qgis:release-3_30
+    image: qgis/qgis:release-3_28
     container_name: qgis
     volumes:
-      - ../qgis/:/tests_directory/${PLUGIN_NAME}
+      - ../ribasim_qgis/:/tests_directory/${PLUGIN_NAME}
     environment:
       - CI=true
       - DISPLAY=:99
diff --git a/.teamcity/Ribasim_Ribasim/buildTypes/Ribasim_Ribasim_MakeQgisPlugin.xml b/.teamcity/Ribasim_Ribasim/buildTypes/Ribasim_Ribasim_MakeQgisPlugin.xml
index 1d8aed453..fb9a9b29c 100644
--- a/.teamcity/Ribasim_Ribasim/buildTypes/Ribasim_Ribasim_MakeQgisPlugin.xml
+++ b/.teamcity/Ribasim_Ribasim/buildTypes/Ribasim_Ribasim_MakeQgisPlugin.xml
@@ -10,7 +10,7 @@
     <build-runners>
       <runner id="RUNNER_2193" name="" type="simpleRunner">
         <parameters>
-          <param name="script.content"><![CDATA[rsync --verbose --recursive --delete qgis/ ribasim_qgis
+          <param name="script.content"><![CDATA[rsync --verbose --recursive --delete ribasim_qgis/ ribasim_qgis
 rm --force ribasim_qgis.zip
 zip -r ribasim_qgis.zip ribasim_qgis]]></param>
           <param name="teamcity.step.mode" value="default" />
diff --git a/build/create_binaries/Project.toml b/build/create_binaries/Project.toml
index 6ca7bb970..41be12376 100644
--- a/build/create_binaries/Project.toml
+++ b/build/create_binaries/Project.toml
@@ -13,9 +13,9 @@ TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"
 
 [compat]
-Artifacts = "1"
-LibGit2 = "1"
+Artifacts = "<0.0.1,1"
+LibGit2 = "<0.0.1,1"
 PackageCompiler = "2"
-TOML = "1"
+TOML = "<0.0.1,1"
 TimeZones = "=1.13.0"
 julia = "1.10"
diff --git a/build/libribasim/Project.toml b/build/libribasim/Project.toml
index e261e4303..2b7700197 100644
--- a/build/libribasim/Project.toml
+++ b/build/libribasim/Project.toml
@@ -12,6 +12,6 @@ TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 
 [compat]
 BasicModelInterface = "0.1"
-Dates = "1"
-TOML = "1"
+Dates = "<0.0.1,1"
+TOML = "<0.0.1,1"
 julia = "1.10"
diff --git a/build/ribasim_cli/Project.toml b/build/ribasim_cli/Project.toml
index b7e785477..728a085ca 100644
--- a/build/ribasim_cli/Project.toml
+++ b/build/ribasim_cli/Project.toml
@@ -13,9 +13,9 @@ TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 TerminalLoggers = "5d786b92-1e48-4d6f-9151-6b4477ca9bed"
 
 [compat]
-Dates = "1"
-Logging = "1"
+Dates = "<0.0.1,1"
+Logging = "<0.0.1,1"
 SciMLBase = "1.60, 2"
-TOML = "1"
+TOML = "<0.0.1,1"
 TerminalLoggers = "0.1.7"
 julia = "1.10"
diff --git a/core/Project.toml b/core/Project.toml
index 678c9139e..44ada21f4 100644
--- a/core/Project.toml
+++ b/core/Project.toml
@@ -41,41 +41,49 @@ TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
 TranscodingStreams = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
 
 [compat]
+Aqua = "0.8"
 Arrow = "2.3"
 BasicModelInterface = "0.1"
+CSV = "0.10"
 CodecLz4 = "0.4"
 CodecZstd = "0.7,0.8"
-ComponentArrays = "0.13.14, 0.14, 0.15"
+ComponentArrays = "0.13,0.14,0.15"
 Configurations = "0.17"
 DBInterface = "2.4"
 DataFrames = "1.4"
 DataInterpolations = "4.4"
 DataStructures = "0.18"
-Dates = "1"
+Dates = "<0.0.1,1"
 Dictionaries = "0.3.25"
 DiffEqCallbacks = "2.29.1"
+Documenter = "0.27,1"
 EnumX = "1.0"
 FiniteDiff = "2.21"
 ForwardDiff = "0.10"
 Graphs = "1.9"
 HiGHS = "1.7"
+IOCapture = "0.2"
 IterTools = "1.4"
 JuMP = "1.15"
 Legolas = "0.5"
-Logging = "1"
+Logging = "<0.0.1,1"
 LoggingExtras = "1"
 MetaGraphsNext = "0.6"
 OrdinaryDiffEq = "6.7"
 PreallocationTools = "0.4"
 SQLite = "1.5.1"
+SafeTestsets = "0.1"
 SciMLBase = "1.60, 2"
-SparseArrays = "1"
+SparseArrays = "<0.0.1,1"
 StructArrays = "0.6.13"
+TOML = "<0.0.1,1"
 Tables = "1"
 TerminalLoggers = "0.1.7"
+Test = "<0.0.1,1"
+TestReports = "0.7"
 TimeZones = "=1.13.0"
 TimerOutputs = "0.5"
-TranscodingStreams = "0.9, 0.10"
+TranscodingStreams = "0.9,0.10"
 julia = "1.10"
 
 [extras]
diff --git a/core/test/runtests.jl b/core/test/runtests.jl
index 6d6c293ff..ae80b3db2 100644
--- a/core/test/runtests.jl
+++ b/core/test/runtests.jl
@@ -17,5 +17,5 @@ using SafeTestsets: @safetestset
     @safetestset "Docs" include("docs.jl")
     @safetestset "Command Line Interface" include("cli.jl")
     @safetestset "libribasim" include("libribasim.jl")
-    Aqua.test_all(Ribasim; ambiguities = false)
+    Aqua.test_all(Ribasim; ambiguities = false, persistent_tasks = false)
 end
diff --git a/docs/Project.toml b/docs/Project.toml
index 452a437b6..751f74e4c 100644
--- a/docs/Project.toml
+++ b/docs/Project.toml
@@ -19,12 +19,12 @@ Ribasim = "aac5e3d9-0b8f-4d4f-8241-b1a7a9632635"
 
 [compat]
 Configurations = "0.17"
-Dates = "1"
-Documenter = "0.27, 1"
+Dates = "<0.0.1,1"
+Documenter = "0.27,1"
 DocumenterMarkdown = "0.2"
-InteractiveUtils = "1"
+InteractiveUtils = "<0.0.1,1"
 JSON3 = "1.12"
 Legolas = "0.5"
-Logging = "1"
+Logging = "<0.0.1,1"
 OrderedCollections = "1.6"
 julia = "1.10"
diff --git a/docs/_quarto.yml b/docs/_quarto.yml
index 574163100..db06752ef 100644
--- a/docs/_quarto.yml
+++ b/docs/_quarto.yml
@@ -91,8 +91,3 @@ quartodoc:
         - Terminal
         - DiscreteControl
         - PidControl
-    - title: Utility functions
-      desc: Collection of utility functions.
-      contents:
-        - utils.geometry_from_connectivity
-        - utils.connectivity_from_geometry
diff --git a/docs/contribute/addnode.qmd b/docs/contribute/addnode.qmd
index 1a9005b37..755aea615 100644
--- a/docs/contribute/addnode.qmd
+++ b/docs/contribute/addnode.qmd
@@ -115,6 +115,7 @@ from typing import Optional
 import pandera as pa
 from pandera.engines.pandas_engine import PydanticModel
 from pandera.typing import DataFrame
+from pydantic import ConfigDict
 
 from ribasim import models
 from ribasim.input_base import TableModel
@@ -142,11 +143,10 @@ class NewNodeType(TableModel):
     possible other schemas
     """
 
-    static: Optional[DataFrame[StaticSchema]] = None
+    static: DataFrame[StaticSchema] | None
     # possible other schemas
 
-    class Config:
-        validate_assignment = True
+    model_config = ConfigDict(validate_assignment=True)
 
     def sort(self):
         self.static.sort_values("node_id", ignore_index=True, inplace=True)
@@ -168,7 +168,7 @@ In `python/ribasim/ribasim/geometry/node.py` add a color and shape description i
 
 # QGIS plugin
 
-The script `qgis/core/nodes.py` has to be updated to specify how the new node type is displayed by the QGIS plugin. Specifically:
+The script `ribasim_qgis/core/nodes.py` has to be updated to specify how the new node type is displayed by the QGIS plugin. Specifically:
 
 - Add a color and shape description in the `MARKERS` dictionary in `Node.renderer`,
   consistent with the entries added above;
diff --git a/docs/core/index.qmd b/docs/core/index.qmd
index daeb53b2b..167feb357 100644
--- a/docs/core/index.qmd
+++ b/docs/core/index.qmd
@@ -16,3 +16,68 @@ can be found in the [Ribasim repository](https://github.com/Deltares/Ribasim) un
 %%| file: ../assets/c4_component_ribasim.mmd
 %%| fig-cap: "Component overview of Ribasim"
 ```
+
+# The simulation loop
+
+`Ribasim.jl` in the above figure can be divided into 3 parts:
+
+- Model initialization
+- Running the simulation loop
+- Writing the output files
+
+The figure below gives a more detailed description of the simulation loop in the form of a [sequence diagram](https://en.wikipedia.org/wiki/Sequence_diagram). From top to bottom, it contains the following blocks:
+
+- Allocation optimization; activated when the allocation timestep has been passed;
+- Control actions; activated when some discrete control callback is triggered;
+- Water balance; computing the flows over flow edges happens each timestep;
+- Time integration step; Done by the selected integrator from `OrdinaryDiffEq.jl`.
+
+```{mermaid}
+sequenceDiagram
+    autonumber
+    participant Int as Process: Integrator
+    participant Optim as Process: Allocation optimization
+    participant Param as Data: Parameters
+    participant State as Data: State
+    participant Sim as Process: Water balance
+    loop Simulation loop (OrdinaryDiffEq.jl)
+        activate Int
+        %% Allocation
+        rect rgb(200, 200, 200)
+            opt Allocation optimization, per allocation network (JuMP.jl, HiGHS)
+                activate Optim
+                Int->>Optim: Callback: allocation timestep has passed
+                Param-->>Optim: Input
+                State-->>Optim: Input
+                Optim->>Optim: Optimize Basin allocations if below target level
+                Optim->>Optim: Optimize User allocation, per priority
+                Optim-->>Param: Set allocated flow rates
+                deactivate Optim
+            end
+        end
+        %% Control
+        rect rgb(200, 200, 200)
+            opt Control actions
+                Int->>Int: DiscreteControl callback
+                Int-->>Param: Parameter updates by control
+            end
+        end
+        %% water_balance!
+        rect rgb(200, 200, 200)
+            activate Sim
+            State-->>Sim: Input
+            Param-->>Sim: Input
+            Sim->>Sim: Compute flows over edges per node type
+            Sim-->>Param: Set flows
+            deactivate Sim
+        end
+        %% Time integration
+        rect rgb(200, 200, 200)
+            State-->>Int: Input
+            Param-->>Int: Input
+            Int->>Int: Time integration step
+            Int-->>State: Update state
+        end
+        deactivate Int
+  end
+```
diff --git a/docs/gen_schema.jl b/docs/gen_schema.jl
index 7cde8ffa5..1f7ccf15c 100644
--- a/docs/gen_schema.jl
+++ b/docs/gen_schema.jl
@@ -67,7 +67,7 @@ function gen_root_schema(TT::Vector, prefix = prefix, name = "root")
         "type" => "object",
     )
     for T in TT
-        tname = strip_prefix(T)
+        tname = lowercase(strip_prefix(T))
         schema["properties"][tname] = OrderedDict("\$ref" => "$tname.schema.json")
     end
     open(normpath(@__DIR__, "schema", "$(name).schema.json"), "w") do io
diff --git a/docs/python/examples.ipynb b/docs/python/examples.ipynb
index ce50ffd93..49130ac37 100644
--- a/docs/python/examples.ipynb
+++ b/docs/python/examples.ipynb
@@ -319,7 +319,7 @@
     ")\n",
     "node_xy = gpd.points_from_xy(x=xy[:, 0], y=xy[:, 1])\n",
     "\n",
-    "node_id, node_type = ribasim.Node.get_node_ids_and_types(\n",
+    "node_id, node_type = ribasim.Node.node_ids_and_types(\n",
     "    basin,\n",
     "    manning_resistance,\n",
     "    rating_curve,\n",
@@ -333,7 +333,7 @@
     "\n",
     "# Make sure the feature id starts at 1: explicitly give an index.\n",
     "node = ribasim.Node(\n",
-    "    static=gpd.GeoDataFrame(\n",
+    "    df=gpd.GeoDataFrame(\n",
     "        data={\"type\": node_type},\n",
     "        index=pd.Index(node_id, name=\"fid\"),\n",
     "        geometry=node_xy,\n",
@@ -361,9 +361,9 @@
     "to_id = np.array(\n",
     "    [2, 3, 4, 5, 8, 6, 7, 9, 9, 10, 12, 3, 13, 14, 6, 1, 17], dtype=np.int64\n",
     ")\n",
-    "lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)\n",
+    "lines = node.geometry_from_connectivity(from_id, to_id)\n",
     "edge = ribasim.Edge(\n",
-    "    static=gpd.GeoDataFrame(\n",
+    "    df=gpd.GeoDataFrame(\n",
     "        data={\n",
     "            \"from_node_id\": from_id,\n",
     "            \"to_node_id\": to_id,\n",
@@ -390,8 +390,10 @@
    "outputs": [],
    "source": [
     "model = ribasim.Model(\n",
-    "    node=node,\n",
-    "    edge=edge,\n",
+    "    network=ribasim.Network(\n",
+    "        node=node,\n",
+    "        edge=edge,\n",
+    "    ),\n",
     "    basin=basin,\n",
     "    level_boundary=level_boundary,\n",
     "    flow_boundary=flow_boundary,\n",
@@ -508,7 +510,7 @@
     "    pd.DataFrame(\n",
     "        data={\n",
     "            \"node_id\": 1,\n",
-    "            \"time\": time,\n",
+    "            \"time\": pd.date_range(model.starttime, model.endtime),\n",
     "            \"drainage\": 0.0,\n",
     "            \"potential_evaporation\": evaporation,\n",
     "            \"infiltration\": 0.0,\n",
@@ -520,7 +522,7 @@
     "    .to_xarray()\n",
     ")\n",
     "\n",
-    "basin_ids = model.basin.static[\"node_id\"].to_numpy()\n",
+    "basin_ids = model.basin.static.df[\"node_id\"].to_numpy()\n",
     "basin_nodes = xr.DataArray(\n",
     "    np.ones(len(basin_ids)), coords={\"node_id\": basin_ids}, dims=[\"node_id\"]\n",
     ")\n",
@@ -548,8 +550,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "model.basin.time = forcing\n",
-    "model.basin.state = state"
+    "model.basin.time.df = forcing\n",
+    "model.basin.state.df = state"
    ]
   },
   {
@@ -675,7 +677,7 @@
     "\n",
     "# Make sure the feature id starts at 1: explicitly give an index.\n",
     "node = ribasim.Node(\n",
-    "    static=gpd.GeoDataFrame(\n",
+    "    df=gpd.GeoDataFrame(\n",
     "        data={\"type\": node_type},\n",
     "        index=pd.Index(np.arange(len(xy)) + 1, name=\"fid\"),\n",
     "        geometry=node_xy,\n",
@@ -703,9 +705,9 @@
     "\n",
     "edge_type = 6 * [\"flow\"] + 2 * [\"control\"]\n",
     "\n",
-    "lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)\n",
+    "lines = node.geometry_from_connectivity(from_id, to_id)\n",
     "edge = ribasim.Edge(\n",
-    "    static=gpd.GeoDataFrame(\n",
+    "    df=gpd.GeoDataFrame(\n",
     "        data={\"from_node_id\": from_id, \"to_node_id\": to_id, \"edge_type\": edge_type},\n",
     "        geometry=lines,\n",
     "        crs=\"EPSG:28992\",\n",
@@ -903,8 +905,10 @@
    "outputs": [],
    "source": [
     "model = ribasim.Model(\n",
-    "    node=node,\n",
-    "    edge=edge,\n",
+    "    network=ribasim.Network(\n",
+    "        node=node,\n",
+    "        edge=edge,\n",
+    "    ),\n",
     "    basin=basin,\n",
     "    pump=pump,\n",
     "    level_boundary=level_boundary,\n",
@@ -994,7 +998,7 @@
     "\n",
     "ax = df_basin_wide[\"level\"].plot()\n",
     "\n",
-    "greater_than = model.discrete_control.condition.greater_than\n",
+    "greater_than = model.discrete_control.condition.df.greater_than\n",
     "\n",
     "ax.hlines(\n",
     "    greater_than,\n",
@@ -1103,7 +1107,7 @@
     "\n",
     "# Make sure the feature id starts at 1: explicitly give an index.\n",
     "node = ribasim.Node(\n",
-    "    static=gpd.GeoDataFrame(\n",
+    "    df=gpd.GeoDataFrame(\n",
     "        data={\"type\": node_type},\n",
     "        index=pd.Index(np.arange(len(xy)) + 1, name=\"fid\"),\n",
     "        geometry=node_xy,\n",
@@ -1128,9 +1132,9 @@
     "from_id = np.array([1, 2, 3, 4, 6, 5, 7], dtype=np.int64)\n",
     "to_id = np.array([2, 3, 4, 6, 2, 3, 6], dtype=np.int64)\n",
     "\n",
-    "lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)\n",
+    "lines = node.geometry_from_connectivity(from_id, to_id)\n",
     "edge = ribasim.Edge(\n",
-    "    static=gpd.GeoDataFrame(\n",
+    "    df=gpd.GeoDataFrame(\n",
     "        data={\n",
     "            \"from_node_id\": from_id,\n",
     "            \"to_node_id\": to_id,\n",
@@ -1325,8 +1329,10 @@
    "outputs": [],
    "source": [
     "model = ribasim.Model(\n",
-    "    node=node,\n",
-    "    edge=edge,\n",
+    "    network=ribasim.Network(\n",
+    "        node=node,\n",
+    "        edge=edge,\n",
+    "    ),\n",
     "    basin=basin,\n",
     "    flow_boundary=flow_boundary,\n",
     "    level_boundary=level_boundary,\n",
@@ -1415,8 +1421,8 @@
     "ax.set_ylabel(\"level [m]\")\n",
     "\n",
     "# Plot target level\n",
-    "target_levels = model.pid_control.time.target.to_numpy()[::2]\n",
-    "times = date2num(model.pid_control.time.time)[::2]\n",
+    "target_levels = model.pid_control.time.df.target.to_numpy()[::2]\n",
+    "times = date2num(model.pid_control.time.df.time)[::2]\n",
     "ax.plot(times, target_levels, color=\"k\", ls=\":\", label=\"target level\")\n",
     "pass"
    ]
@@ -1445,7 +1451,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.11.6"
   }
  },
  "nbformat": 4,
diff --git a/docs/schema/root.schema.json b/docs/schema/root.schema.json
index ad7a55499..751f152f0 100644
--- a/docs/schema/root.schema.json
+++ b/docs/schema/root.schema.json
@@ -1,77 +1,77 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "properties": {
-        "BasinProfile": {
-            "$ref": "BasinProfile.schema.json"
+        "basinprofile": {
+            "$ref": "basinprofile.schema.json"
         },
-        "BasinState": {
-            "$ref": "BasinState.schema.json"
+        "basinstate": {
+            "$ref": "basinstate.schema.json"
         },
-        "BasinStatic": {
-            "$ref": "BasinStatic.schema.json"
+        "basinstatic": {
+            "$ref": "basinstatic.schema.json"
         },
-        "BasinTime": {
-            "$ref": "BasinTime.schema.json"
+        "basintime": {
+            "$ref": "basintime.schema.json"
         },
-        "DiscreteControlCondition": {
-            "$ref": "DiscreteControlCondition.schema.json"
+        "discretecontrolcondition": {
+            "$ref": "discretecontrolcondition.schema.json"
         },
-        "DiscreteControlLogic": {
-            "$ref": "DiscreteControlLogic.schema.json"
+        "discretecontrollogic": {
+            "$ref": "discretecontrollogic.schema.json"
         },
-        "Edge": {
-            "$ref": "Edge.schema.json"
+        "edge": {
+            "$ref": "edge.schema.json"
         },
-        "FlowBoundaryStatic": {
-            "$ref": "FlowBoundaryStatic.schema.json"
+        "flowboundarystatic": {
+            "$ref": "flowboundarystatic.schema.json"
         },
-        "FlowBoundaryTime": {
-            "$ref": "FlowBoundaryTime.schema.json"
+        "flowboundarytime": {
+            "$ref": "flowboundarytime.schema.json"
         },
-        "FractionalFlowStatic": {
-            "$ref": "FractionalFlowStatic.schema.json"
+        "fractionalflowstatic": {
+            "$ref": "fractionalflowstatic.schema.json"
         },
-        "LevelBoundaryStatic": {
-            "$ref": "LevelBoundaryStatic.schema.json"
+        "levelboundarystatic": {
+            "$ref": "levelboundarystatic.schema.json"
         },
-        "LevelBoundaryTime": {
-            "$ref": "LevelBoundaryTime.schema.json"
+        "levelboundarytime": {
+            "$ref": "levelboundarytime.schema.json"
         },
-        "LinearResistanceStatic": {
-            "$ref": "LinearResistanceStatic.schema.json"
+        "linearresistancestatic": {
+            "$ref": "linearresistancestatic.schema.json"
         },
-        "ManningResistanceStatic": {
-            "$ref": "ManningResistanceStatic.schema.json"
+        "manningresistancestatic": {
+            "$ref": "manningresistancestatic.schema.json"
         },
-        "Node": {
-            "$ref": "Node.schema.json"
+        "node": {
+            "$ref": "node.schema.json"
         },
-        "OutletStatic": {
-            "$ref": "OutletStatic.schema.json"
+        "outletstatic": {
+            "$ref": "outletstatic.schema.json"
         },
-        "PidControlStatic": {
-            "$ref": "PidControlStatic.schema.json"
+        "pidcontrolstatic": {
+            "$ref": "pidcontrolstatic.schema.json"
         },
-        "PidControlTime": {
-            "$ref": "PidControlTime.schema.json"
+        "pidcontroltime": {
+            "$ref": "pidcontroltime.schema.json"
         },
-        "PumpStatic": {
-            "$ref": "PumpStatic.schema.json"
+        "pumpstatic": {
+            "$ref": "pumpstatic.schema.json"
         },
-        "TabulatedRatingCurveStatic": {
-            "$ref": "TabulatedRatingCurveStatic.schema.json"
+        "tabulatedratingcurvestatic": {
+            "$ref": "tabulatedratingcurvestatic.schema.json"
         },
-        "TabulatedRatingCurveTime": {
-            "$ref": "TabulatedRatingCurveTime.schema.json"
+        "tabulatedratingcurvetime": {
+            "$ref": "tabulatedratingcurvetime.schema.json"
         },
-        "TerminalStatic": {
-            "$ref": "TerminalStatic.schema.json"
+        "terminalstatic": {
+            "$ref": "terminalstatic.schema.json"
         },
-        "UserStatic": {
-            "$ref": "UserStatic.schema.json"
+        "userstatic": {
+            "$ref": "userstatic.schema.json"
         },
-        "UserTime": {
-            "$ref": "UserTime.schema.json"
+        "usertime": {
+            "$ref": "usertime.schema.json"
         }
     },
     "$id": "https://deltares.github.io/Ribasim/schema/root.schema.json",
diff --git a/pixi.lock b/pixi.lock
index f706f65ad..aade82e53 100644
--- a/pixi.lock
+++ b/pixi.lock
@@ -1,3 +1,4 @@
+version: 2
 metadata:
   content_hash:
     linux-64: e90c2ee71ad70fc0a1c8302029533a7d1498f2bffcd0eaa8d2934700e775dc1d
@@ -76,6 +77,90 @@ package:
   license_family: GPL
   size: 554938
   timestamp: 1693607226431
+- platform: linux-64
+  name: annotated-types
+  version: 0.6.0
+  category: main
+  manager: conda
+  dependencies:
+  - python >=3.7
+  - typing-extensions >=4.0.0
+  url: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.6.0-pyhd8ed1ab_0.conda
+  hash:
+    md5: 997c29372bdbe2afee073dff71f35923
+    sha256: 3a2c98154d95cfd54daba6b7d507d31f5ba07ac2ad955c44eb041b66563193cd
+  build: pyhd8ed1ab_0
+  arch: x86_64
+  subdir: linux-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 17026
+  timestamp: 1696634393637
+- platform: osx-64
+  name: annotated-types
+  version: 0.6.0
+  category: main
+  manager: conda
+  dependencies:
+  - python >=3.7
+  - typing-extensions >=4.0.0
+  url: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.6.0-pyhd8ed1ab_0.conda
+  hash:
+    md5: 997c29372bdbe2afee073dff71f35923
+    sha256: 3a2c98154d95cfd54daba6b7d507d31f5ba07ac2ad955c44eb041b66563193cd
+  build: pyhd8ed1ab_0
+  arch: x86_64
+  subdir: osx-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 17026
+  timestamp: 1696634393637
+- platform: osx-arm64
+  name: annotated-types
+  version: 0.6.0
+  category: main
+  manager: conda
+  dependencies:
+  - python >=3.7
+  - typing-extensions >=4.0.0
+  url: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.6.0-pyhd8ed1ab_0.conda
+  hash:
+    md5: 997c29372bdbe2afee073dff71f35923
+    sha256: 3a2c98154d95cfd54daba6b7d507d31f5ba07ac2ad955c44eb041b66563193cd
+  build: pyhd8ed1ab_0
+  arch: aarch64
+  subdir: osx-arm64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 17026
+  timestamp: 1696634393637
+- platform: win-64
+  name: annotated-types
+  version: 0.6.0
+  category: main
+  manager: conda
+  dependencies:
+  - python >=3.7
+  - typing-extensions >=4.0.0
+  url: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.6.0-pyhd8ed1ab_0.conda
+  hash:
+    md5: 997c29372bdbe2afee073dff71f35923
+    sha256: 3a2c98154d95cfd54daba6b7d507d31f5ba07ac2ad955c44eb041b66563193cd
+  build: pyhd8ed1ab_0
+  arch: x86_64
+  subdir: win-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 17026
+  timestamp: 1696634393637
 - platform: linux-64
   name: anyio
   version: 4.0.0
@@ -218,15 +303,15 @@ package:
   timestamp: 1649077760928
 - platform: linux-64
   name: argcomplete
-  version: 3.1.4
+  version: 3.1.6
   category: main
   manager: conda
   dependencies:
   - python >=3.8
-  url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.1.4-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.1.6-pyhd8ed1ab_0.conda
   hash:
-    md5: 1be9feadb435ef26456efaf70852ce93
-    sha256: e0abc3e71e9f0af65afb9dc3f3d4991c117508023ebcef223b2394a43313ccc9
+    md5: c629a13439d80b37c6a946b098c4ac2b
+    sha256: 62c3486961e43fb9b495b7854f48fea9b486b2176a9629c6faf80c445543b1aa
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: linux-64
@@ -234,19 +319,19 @@ package:
   license: Apache-2.0
   license_family: Apache
   noarch: python
-  size: 39566
-  timestamp: 1698912237718
+  size: 39628
+  timestamp: 1699843246341
 - platform: osx-64
   name: argcomplete
-  version: 3.1.4
+  version: 3.1.6
   category: main
   manager: conda
   dependencies:
   - python >=3.8
-  url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.1.4-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.1.6-pyhd8ed1ab_0.conda
   hash:
-    md5: 1be9feadb435ef26456efaf70852ce93
-    sha256: e0abc3e71e9f0af65afb9dc3f3d4991c117508023ebcef223b2394a43313ccc9
+    md5: c629a13439d80b37c6a946b098c4ac2b
+    sha256: 62c3486961e43fb9b495b7854f48fea9b486b2176a9629c6faf80c445543b1aa
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: osx-64
@@ -254,19 +339,19 @@ package:
   license: Apache-2.0
   license_family: Apache
   noarch: python
-  size: 39566
-  timestamp: 1698912237718
+  size: 39628
+  timestamp: 1699843246341
 - platform: osx-arm64
   name: argcomplete
-  version: 3.1.4
+  version: 3.1.6
   category: main
   manager: conda
   dependencies:
   - python >=3.8
-  url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.1.4-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.1.6-pyhd8ed1ab_0.conda
   hash:
-    md5: 1be9feadb435ef26456efaf70852ce93
-    sha256: e0abc3e71e9f0af65afb9dc3f3d4991c117508023ebcef223b2394a43313ccc9
+    md5: c629a13439d80b37c6a946b098c4ac2b
+    sha256: 62c3486961e43fb9b495b7854f48fea9b486b2176a9629c6faf80c445543b1aa
   build: pyhd8ed1ab_0
   arch: aarch64
   subdir: osx-arm64
@@ -274,19 +359,19 @@ package:
   license: Apache-2.0
   license_family: Apache
   noarch: python
-  size: 39566
-  timestamp: 1698912237718
+  size: 39628
+  timestamp: 1699843246341
 - platform: win-64
   name: argcomplete
-  version: 3.1.4
+  version: 3.1.6
   category: main
   manager: conda
   dependencies:
   - python >=3.8
-  url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.1.4-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.1.6-pyhd8ed1ab_0.conda
   hash:
-    md5: 1be9feadb435ef26456efaf70852ce93
-    sha256: e0abc3e71e9f0af65afb9dc3f3d4991c117508023ebcef223b2394a43313ccc9
+    md5: c629a13439d80b37c6a946b098c4ac2b
+    sha256: 62c3486961e43fb9b495b7854f48fea9b486b2176a9629c6faf80c445543b1aa
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: win-64
@@ -294,8 +379,8 @@ package:
   license: Apache-2.0
   license_family: Apache
   noarch: python
-  size: 39566
-  timestamp: 1698912237718
+  size: 39628
+  timestamp: 1699843246341
 - platform: linux-64
   name: argon2-cffi
   version: 23.1.0
@@ -838,360 +923,360 @@ package:
   timestamp: 1683424195402
 - platform: linux-64
   name: aws-c-auth
-  version: 0.7.5
+  version: 0.7.6
   category: main
   manager: conda
   dependencies:
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - aws-c-sdkutils >=0.1.12,<0.1.13.0a0
   - libgcc-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-auth-0.7.5-ha588130_3.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-auth-0.7.6-h37ad1db_0.conda
   hash:
-    md5: 9e2e559c6f65c773428638d28992a020
-    sha256: 32cfb7d61aa11ffb449c54a57e8a91bed087dff57caf3d5a1cd5e483471549d3
-  build: ha588130_3
+    md5: 31836ccf72bc70ce2ec38a2ec2c8b504
+    sha256: 6f44ef79e2ab5005961847cdefd2a71aa3a33c741adc77e774ac9dbedd9a2f81
+  build: h37ad1db_0
   arch: x86_64
   subdir: linux-64
-  build_number: 3
+  build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 101868
-  timestamp: 1699547683051
+  size: 102400
+  timestamp: 1699658580768
 - platform: osx-64
   name: aws-c-auth
-  version: 0.7.5
+  version: 0.7.6
   category: main
   manager: conda
   dependencies:
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - aws-c-sdkutils >=0.1.12,<0.1.13.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-auth-0.7.5-h3724742_3.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-auth-0.7.6-hc3630cc_0.conda
   hash:
-    md5: 03074c51bcadc34cc887356164ce8daa
-    sha256: 4b7cb9bc0b3ef3a2593582c678293517a17a265eaead4d57bde291989838cbe0
-  build: h3724742_3
+    md5: 1d23f626932e996892200295251d3f21
+    sha256: c377f6d42e895409fef51d868f0061b4a99cbf728030abcde318a37a12c0518a
+  build: hc3630cc_0
   arch: x86_64
   subdir: osx-64
-  build_number: 3
+  build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 89202
-  timestamp: 1699547932681
+  size: 89695
+  timestamp: 1699658862651
 - platform: osx-arm64
   name: aws-c-auth
-  version: 0.7.5
+  version: 0.7.6
   category: main
   manager: conda
   dependencies:
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - aws-c-sdkutils >=0.1.12,<0.1.13.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-auth-0.7.5-h9df502d_3.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-auth-0.7.6-h30f9597_0.conda
   hash:
-    md5: dc72d81f6cec64e7e4e11b588abf504b
-    sha256: 4098cd8b6ca9250837bfefcb0caf086e853b1d45a11249d78b6134bc5f9fe801
-  build: h9df502d_3
+    md5: 91a5e2b3608eaa0760c0921e00cad72c
+    sha256: 349efb5d66e108cfe21df0cf62209f5175b7a59b99ef7bf96f841274ccb2cc56
+  build: h30f9597_0
   arch: aarch64
   subdir: osx-arm64
-  build_number: 3
+  build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 87718
-  timestamp: 1699548019361
+  size: 88633
+  timestamp: 1699658886332
 - platform: win-64
   name: aws-c-auth
-  version: 0.7.5
+  version: 0.7.6
   category: main
   manager: conda
   dependencies:
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - aws-c-sdkutils >=0.1.12,<0.1.13.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-auth-0.7.5-h17e7c68_3.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-auth-0.7.6-h2364229_0.conda
   hash:
-    md5: eae689f306df4f7c8a6a8675d31ef4e1
-    sha256: b3efc2fdd04f43ca611bdda5b0521f32d80c43d05eb1587267ef7c6383e30c94
-  build: h17e7c68_3
+    md5: ebe85caf614226fafe575ac4d77d5367
+    sha256: 78bc556723a85ab029bfc3405ae8127b07ca1c8c42fe003dd67d817f79fa5afe
+  build: h2364229_0
   arch: x86_64
   subdir: win-64
-  build_number: 3
+  build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 97189
-  timestamp: 1699548292846
+  size: 98768
+  timestamp: 1699659225642
 - platform: linux-64
   name: aws-c-cal
   version: 0.6.9
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - libgcc-ng >=12
   - openssl >=3.1.4,<4.0a0
-  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-cal-0.6.9-h0fad3b2_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-cal-0.6.9-h3b91eb8_1.conda
   hash:
-    md5: fb2e57e277d6f22fd3ad63aaa4353f1f
-    sha256: 88bd3173d7079f86973d9fdc46e42850746004b92b62348dc40f957eeab18aee
-  build: h0fad3b2_0
+    md5: ab28ae62aa4738f7ca0622554aadc31b
+    sha256: 8bca41960971a2f6eea0d61a30e6d8b1bf80f520b5959aba92b87d1385d3d0cd
+  build: h3b91eb8_1
   arch: x86_64
   subdir: linux-64
-  build_number: 0
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
-  size: 55576
-  timestamp: 1698723210863
+  size: 55385
+  timestamp: 1699535368278
 - platform: osx-64
   name: aws-c-cal
   version: 0.6.9
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-cal-0.6.9-h01c20f0_0.conda
+  - aws-c-common >=0.9.8,<0.9.9.0a0
+  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-cal-0.6.9-h49e9720_1.conda
   hash:
-    md5: f2e9b329a90095a855e3ad14b63d5ffe
-    sha256: f430e96964bba6108dfc3bbd177932d6691a822518cc29b037ba6cfbfe74b79d
-  build: h01c20f0_0
+    md5: a1fc363f4bcbc029a096df632e1b06ab
+    sha256: 4f7f92067ecf18696a40fedacdc189ffa045020ebd0948ad094624d7c5a8e5a2
+  build: h49e9720_1
   arch: x86_64
   subdir: osx-64
-  build_number: 0
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
-  size: 45656
-  timestamp: 1698723511528
+  size: 45609
+  timestamp: 1699535536649
 - platform: osx-arm64
   name: aws-c-cal
   version: 0.6.9
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-cal-0.6.9-he63e28a_0.conda
+  - aws-c-common >=0.9.8,<0.9.9.0a0
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-cal-0.6.9-hea61927_1.conda
   hash:
-    md5: ee1d0219702c1b9fef1fe726d8c42607
-    sha256: 365948c17452e3974cccb8d9debca4fce768ba7793420b5766b1b7de6526ce41
-  build: he63e28a_0
+    md5: 844a59d5740f086963219373174de1d3
+    sha256: ebd4b794986b745fb9a9931162e7ca6a4a759625203d995749e5dfc0e23d0e6e
+  build: hea61927_1
   arch: aarch64
   subdir: osx-arm64
-  build_number: 0
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
-  size: 39565
-  timestamp: 1698723617668
+  size: 39478
+  timestamp: 1699535745689
 - platform: win-64
   name: aws-c-cal
   version: 0.6.9
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-cal-0.6.9-h6f45060_0.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-cal-0.6.9-hde771f8_1.conda
   hash:
-    md5: 4eedbc42e1b7538ff814795fb6f108ed
-    sha256: d0b60235841a8e5ec387d6f50534ba7613139d9dacafdfa294a41980780318e0
-  build: h6f45060_0
+    md5: f7ff23ec97013e737bc7c864c3a17cc6
+    sha256: fea5e075ea232c0d5fe447aeb18a3c63fd7d412d8ab1d54b63426b4e11b20952
+  build: hde771f8_1
   arch: x86_64
   subdir: win-64
-  build_number: 0
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
-  size: 55274
-  timestamp: 1698723449078
+  size: 55317
+  timestamp: 1699535911970
 - platform: linux-64
   name: aws-c-common
-  version: 0.9.5
+  version: 0.9.8
   category: main
   manager: conda
   dependencies:
   - libgcc-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-common-0.9.5-hd590300_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-common-0.9.8-hd590300_0.conda
   hash:
-    md5: 122ea634665516ff5af2f21c816fbe33
-    sha256: be392c2287ff96b47425b6e27e06305360f2eefc850b443db4e91313963c6e57
+    md5: 1fd5f2ae093f2dbf28dc4f18fca57309
+    sha256: 09075cb426a0b903b7ca86e4f399eb0be02b6d24e403792a5f378064fcb7a08b
   build: hd590300_0
   arch: x86_64
   subdir: linux-64
   build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 222208
-  timestamp: 1698608142340
+  size: 225053
+  timestamp: 1699511171901
 - platform: osx-64
   name: aws-c-common
-  version: 0.9.5
+  version: 0.9.8
   category: main
   manager: conda
   dependencies: []
-  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-common-0.9.5-h10d778d_0.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-common-0.9.8-h10d778d_0.conda
   hash:
-    md5: 86cd033730d619e4c1a4d02c0f362055
-    sha256: a3081b4dd057046f89001a6b70a190abd8ea396f46b6224b1dc88727d76c7737
+    md5: 1835ae87bcb96111220344774a930f02
+    sha256: 4aac7a22b208c13707297d8e08c62569186f4dcc2ed3cd01ffa79af4576e3dcc
   build: h10d778d_0
   arch: x86_64
   subdir: osx-64
   build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 206303
-  timestamp: 1698608208428
+  size: 207496
+  timestamp: 1699511311716
 - platform: osx-arm64
   name: aws-c-common
-  version: 0.9.5
+  version: 0.9.8
   category: main
   manager: conda
   dependencies: []
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-common-0.9.5-h93a5062_0.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-common-0.9.8-h93a5062_0.conda
   hash:
-    md5: 670b887541c5cee02511e39e29e509ae
-    sha256: 5c46363060b9cd15a1e45f9c03a7252f8e40c66e594d6696f7f2a1c37c14af54
+    md5: cde0cd0c85e62c192da64c49130a7ccd
+    sha256: 811730643b941f7b3419fdba4824aaac745944e4bcc462c5737ba4025213158e
   build: h93a5062_0
   arch: aarch64
   subdir: osx-arm64
   build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 201197
-  timestamp: 1698608212743
+  size: 202672
+  timestamp: 1699511361474
 - platform: win-64
   name: aws-c-common
-  version: 0.9.5
+  version: 0.9.8
   category: main
   manager: conda
   dependencies:
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-common-0.9.5-hcfcfb64_0.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-common-0.9.8-hcfcfb64_0.conda
   hash:
-    md5: 292211bae5e16575ed3a0daa96bd4506
-    sha256: fdb9cebe93ca2c2c4eb2fa3c3fb350a33628f70b11ba7adb9bb9e0283ac3bf85
+    md5: 35d4a1cd187c1902eb6d344686e66106
+    sha256: c0c093f2858eafa77520d83d5bbf94fde277da85c07d3da7fd91df7b1a7fbf87
   build: hcfcfb64_0
   arch: x86_64
   subdir: win-64
   build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 218817
-  timestamp: 1698608623257
+  size: 221926
+  timestamp: 1699511682549
 - platform: linux-64
   name: aws-c-compression
   version: 0.2.17
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - libgcc-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-compression-0.2.17-h3e65c2a_5.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-compression-0.2.17-hfd9eb17_6.conda
   hash:
-    md5: e80b852f5333dd56353beb73f0fecd43
-    sha256: d791fe3a0ce361b37e00b7e796a4db13408cddaa31c7991617ca5f5dca213895
-  build: h3e65c2a_5
+    md5: aee687dcfcc2a75d77b6e6024273978a
+    sha256: d67e50aff37474eee393346d71c9e4bbb6d190f86722ac932b2837acfea33f76
+  build: hfd9eb17_6
   arch: x86_64
   subdir: linux-64
-  build_number: 5
+  build_number: 6
   license: Apache-2.0
   license_family: Apache
-  size: 19086
-  timestamp: 1698701411987
+  size: 19054
+  timestamp: 1699535389860
 - platform: osx-64
   name: aws-c-compression
   version: 0.2.17
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-compression-0.2.17-ha78fcfa_5.conda
+  - aws-c-common >=0.9.8,<0.9.9.0a0
+  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-compression-0.2.17-hff1f2c8_6.conda
   hash:
-    md5: 074f9f22878842c644cd1c7ea57cc6fa
-    sha256: 7de1d89825d5ddc9143f1d7b6a44e8bf978ce5556f27c48a092b31071ef2495d
-  build: ha78fcfa_5
+    md5: d44348239e6be8e1a418cfeda24bc1b5
+    sha256: b82eae800be7a26fb0a8d39c009c39f3b8f474d05dcb636b7b8e225ca7c7da2b
+  build: hff1f2c8_6
   arch: x86_64
   subdir: osx-64
-  build_number: 5
+  build_number: 6
   license: Apache-2.0
   license_family: Apache
-  size: 18097
-  timestamp: 1698701646677
+  size: 18031
+  timestamp: 1699535575204
 - platform: osx-arm64
   name: aws-c-compression
   version: 0.2.17
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-compression-0.2.17-he63e28a_5.conda
+  - aws-c-common >=0.9.8,<0.9.9.0a0
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-compression-0.2.17-hea61927_6.conda
   hash:
-    md5: 7e6495024259d31bd33a0f43620f238a
-    sha256: 06f77f7b9a176c7a57683e11b47c022a14bee574b09259675427d0b65c3be604
-  build: he63e28a_5
+    md5: 61e64f2091370b64430faf5fe021bc54
+    sha256: 01f5d5397def8f38263cc8bf3a31d2063602238073847a2941fd7f28f01da617
+  build: hea61927_6
   arch: aarch64
   subdir: osx-arm64
-  build_number: 5
+  build_number: 6
   license: Apache-2.0
   license_family: Apache
-  size: 18149
-  timestamp: 1698701642078
+  size: 17917
+  timestamp: 1699535888429
 - platform: win-64
   name: aws-c-compression
   version: 0.2.17
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-compression-0.2.17-h6f45060_5.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-compression-0.2.17-hde771f8_6.conda
   hash:
-    md5: 733834c9c9d08bdc86d0b64df82dc68b
-    sha256: 4d65b1ed46e8b4a219e2dfabc002577505d4ce803178e66971cc8d468fe3dca5
-  build: h6f45060_5
+    md5: 0e05aa2ca94405102e81d9afc0b89567
+    sha256: a3fe5734b11a77c5c51b7274f59fa09af33671692aad569c2f23452550536984
+  build: hde771f8_6
   arch: x86_64
   subdir: win-64
-  build_number: 5
+  build_number: 6
   license: Apache-2.0
   license_family: Apache
-  size: 22636
-  timestamp: 1698702029337
+  size: 22535
+  timestamp: 1699535932006
 - platform: linux-64
   name: aws-c-event-stream
   version: 0.3.2
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - aws-checksums >=0.1.17,<0.1.18.0a0
   - libgcc-ng >=12
   - libstdcxx-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-event-stream-0.3.2-hc1d3383_5.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-event-stream-0.3.2-hae413d4_6.conda
   hash:
-    md5: 9064e3f924fe776f23197ac09e178915
-    sha256: 754ce138ad461df1ec81cfce817479af10cc3e2514eb265d16b277091fae8af4
-  build: hc1d3383_5
+    md5: b4e69f0e7f832dc901bd585f353487f0
+    sha256: b7b00593f4cd835780d3a4f61f6f77181b33b8e85cc0f78d9cb48dc1d84e8443
+  build: hae413d4_6
   arch: x86_64
   subdir: linux-64
-  build_number: 5
+  build_number: 6
   license: Apache-2.0
   license_family: Apache
-  size: 53918
-  timestamp: 1698738745123
+  size: 53880
+  timestamp: 1699561310776
 - platform: osx-64
   name: aws-c-event-stream
   version: 0.3.2
@@ -1199,22 +1284,22 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - aws-checksums >=0.1.17,<0.1.18.0a0
   - libcxx >=16.0.6
-  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-event-stream-0.3.2-h1738cac_5.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-event-stream-0.3.2-hb6e475e_6.conda
   hash:
-    md5: ce2268bc63d3936eb7520b6b12997ee2
-    sha256: 15d0b1bf644a89461efa2f6a206f7c31caa3c605920da1645798379b06b36cfa
-  build: h1738cac_5
+    md5: 19b99f3797acdd59e95a8c1e9cc648df
+    sha256: 24f9fe6ad0f22c36d1dc49280fcbe90a157c3ba65664f27746aa6e67d6cbbb63
+  build: hb6e475e_6
   arch: x86_64
   subdir: osx-64
-  build_number: 5
+  build_number: 6
   license: Apache-2.0
   license_family: Apache
-  size: 47220
-  timestamp: 1698738960192
+  size: 46798
+  timestamp: 1699561524075
 - platform: osx-arm64
   name: aws-c-event-stream
   version: 0.3.2
@@ -1222,46 +1307,46 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - aws-checksums >=0.1.17,<0.1.18.0a0
   - libcxx >=16.0.6
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-event-stream-0.3.2-h1dc1696_5.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-event-stream-0.3.2-h32206d9_6.conda
   hash:
-    md5: 4455748c072e91880008764d2bc7d5ae
-    sha256: d72e8eec3dba375236245a05dec61d6424fc891cd166eec04300d4d443157ee2
-  build: h1dc1696_5
+    md5: 498485eaae26d9241fa08641e461ec41
+    sha256: 2dbeab2e4211ff27ffcc8e4770df4e3083d8d9bb524154ff4ce8d42c3a35a54a
+  build: h32206d9_6
   arch: aarch64
   subdir: osx-arm64
-  build_number: 5
+  build_number: 6
   license: Apache-2.0
   license_family: Apache
-  size: 47449
-  timestamp: 1698739002903
+  size: 47000
+  timestamp: 1699561582569
 - platform: win-64
   name: aws-c-event-stream
   version: 0.3.2
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - aws-checksums >=0.1.17,<0.1.18.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-event-stream-0.3.2-h65f5141_5.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-event-stream-0.3.2-he53de8f_6.conda
   hash:
-    md5: 235e8c9fa5aa698a6003357a55d0e711
-    sha256: 15bf9ba1bbc4f8b5e5e1edca49b9a6cd44bb5794536353080f1eadfc3b5991a5
-  build: h65f5141_5
+    md5: a8817c4fd9bd978fff70bc9feddb011f
+    sha256: fb7706d1da989da614349fd181b7c9b6159bd65ea4626705b99ad4b1e5f583ce
+  build: he53de8f_6
   arch: x86_64
   subdir: win-64
-  build_number: 5
+  build_number: 6
   license: Apache-2.0
   license_family: Apache
-  size: 54785
-  timestamp: 1698739263144
+  size: 54505
+  timestamp: 1699561879986
 - platform: linux-64
   name: aws-c-http
   version: 0.7.14
@@ -1269,22 +1354,22 @@ package:
   manager: conda
   dependencies:
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-compression >=0.2.17,<0.2.18.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - libgcc-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-http-0.7.14-h858fa18_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-http-0.7.14-h162056d_1.conda
   hash:
-    md5: 02ca6e2c98d6d2512993eca3c634a7dc
-    sha256: 4a1d5979d5c0fc2d12d3a1983d4704d21f498c841525644871ff8c07613e8786
-  build: h858fa18_0
+    md5: e1b49ef8ddc4faca06a63a7e25da644f
+    sha256: dc4cda9ffef3b5859c5943f010e947e082315e7d84eb1f5e0b3cd58565eaf405
+  build: h162056d_1
   arch: x86_64
   subdir: linux-64
-  build_number: 0
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
-  size: 194582
-  timestamp: 1699469226201
+  size: 194479
+  timestamp: 1699561380461
 - platform: osx-64
   name: aws-c-http
   version: 0.7.14
@@ -1292,21 +1377,21 @@ package:
   manager: conda
   dependencies:
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-compression >=0.2.17,<0.2.18.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-http-0.7.14-hbc44fbd_0.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-http-0.7.14-h950a07a_1.conda
   hash:
-    md5: f0c8129cb242c2a0f888525980605646
-    sha256: d0b7a2312d1139501a3c9fc6dcd34eb447cb9cda66b7ba09fd2a78d46455f593
-  build: hbc44fbd_0
+    md5: 0827fb5a8c4a4d209fa44088f3046b40
+    sha256: 9fe20e7a79f7a66dec9b4c4eccc56db3e820b7cc380689fff53f19e0b1c05b72
+  build: h950a07a_1
   arch: x86_64
   subdir: osx-64
-  build_number: 0
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
-  size: 162623
-  timestamp: 1699469645007
+  size: 162494
+  timestamp: 1699561754961
 - platform: osx-arm64
   name: aws-c-http
   version: 0.7.14
@@ -1314,21 +1399,21 @@ package:
   manager: conda
   dependencies:
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-compression >=0.2.17,<0.2.18.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-http-0.7.14-h883952f_0.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-http-0.7.14-h673bc1b_1.conda
   hash:
-    md5: cbeb1609f324dd4a737238450e2fc703
-    sha256: 78afb1cdc94d2cdafea2f42c3813896417fd85a72c52db6e1b90659c48ea0a50
-  build: h883952f_0
+    md5: 8cb609edc86062a2f7a1482678c65e56
+    sha256: 320b1d8faa845b25a1e58371def7694fc7561d46cf7a38d8384997ac7cab8616
+  build: h673bc1b_1
   arch: aarch64
   subdir: osx-arm64
-  build_number: 0
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
-  size: 151117
-  timestamp: 1699469666079
+  size: 151027
+  timestamp: 1699561878171
 - platform: win-64
   name: aws-c-http
   version: 0.7.14
@@ -1336,24 +1421,24 @@ package:
   manager: conda
   dependencies:
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-compression >=0.2.17,<0.2.18.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-http-0.7.14-h4076b5e_0.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-http-0.7.14-h0e17c8e_1.conda
   hash:
-    md5: 5b529ce58ccf7fde3e87eab0e7a76f68
-    sha256: 08d0319fad24822a33f30ef907e0761f5dd5c0ae0d579b5222c0ac028c1c0603
-  build: h4076b5e_0
+    md5: 043cbf65f2b35beeb830ef2b81928d55
+    sha256: 37263225a1405fc855bfd2f9b096afd34ea8b80fb12a87c238517a8be1fe127f
+  build: h0e17c8e_1
   arch: x86_64
   subdir: win-64
-  build_number: 0
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
-  size: 179958
-  timestamp: 1699469850661
+  size: 179364
+  timestamp: 1699561967054
 - platform: linux-64
   name: aws-c-io
   version: 0.13.35
@@ -1361,21 +1446,21 @@ package:
   manager: conda
   dependencies:
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - libgcc-ng >=12
   - s2n >=1.3.56,<1.3.57.0a0
-  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-io-0.13.35-hf90439a_7.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-io-0.13.35-hc23c90e_8.conda
   hash:
-    md5: 53c7db6199c129a61dfb3b8cb32bdc34
-    sha256: 2eecf18936cdfe470236d7b1ecd904017336a540f9705c3493e8462e88d51028
-  build: hf90439a_7
+    md5: 4cabe68190c1ff4c72154c0a7d2e980c
+    sha256: 89103265c27cb5ad67a0f6b67149532e7addae4b6ddfb704e77f0369f5520591
+  build: hc23c90e_8
   arch: x86_64
   subdir: linux-64
-  build_number: 7
+  build_number: 8
   license: Apache-2.0
   license_family: Apache
-  size: 156440
-  timestamp: 1699362826884
+  size: 156721
+  timestamp: 1699547987524
 - platform: osx-64
   name: aws-c-io
   version: 0.13.35
@@ -1383,19 +1468,19 @@ package:
   manager: conda
   dependencies:
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-io-0.13.35-ha5bf2a1_7.conda
+  - aws-c-common >=0.9.8,<0.9.9.0a0
+  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-io-0.13.35-hb98174f_8.conda
   hash:
-    md5: 6136be3da640eb5236c87c7c81d190b3
-    sha256: 0966a4263cf8b30cee9265c60b49a59d17f5723b385ae92a7953c24892e5dc9f
-  build: ha5bf2a1_7
+    md5: c7b0ed5a258d3a8bb991bdc935b3703a
+    sha256: f44243ab77bef1475565cfd2c432608d530d70f3b7d690effa8e1c47b3bb2d90
+  build: hb98174f_8
   arch: x86_64
   subdir: osx-64
-  build_number: 7
+  build_number: 8
   license: Apache-2.0
   license_family: Apache
-  size: 137623
-  timestamp: 1699362970908
+  size: 137165
+  timestamp: 1699548283457
 - platform: osx-arm64
   name: aws-c-io
   version: 0.13.35
@@ -1403,19 +1488,19 @@ package:
   manager: conda
   dependencies:
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-io-0.13.35-hc042dea_7.conda
+  - aws-c-common >=0.9.8,<0.9.9.0a0
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-io-0.13.35-he1b4ce3_8.conda
   hash:
-    md5: 77ba8c6681ba3cbe58d95053bed475ba
-    sha256: f00571ed7d9ec2592ff8349f2decb54e52b3937a1e27ea4395f8f937ca740e8c
-  build: hc042dea_7
+    md5: 2b17730ac8242c1ba995baa5cfb1641e
+    sha256: c0112899e785d550ed0c16e930ab52119c312098a24eebc5d808c53d0f36effb
+  build: he1b4ce3_8
   arch: aarch64
   subdir: osx-arm64
-  build_number: 7
+  build_number: 8
   license: Apache-2.0
   license_family: Apache
-  size: 136004
-  timestamp: 1699363132815
+  size: 137327
+  timestamp: 1699548210602
 - platform: win-64
   name: aws-c-io
   version: 0.13.35
@@ -1423,515 +1508,515 @@ package:
   manager: conda
   dependencies:
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-io-0.13.35-he032580_7.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-io-0.13.35-h56d495d_8.conda
   hash:
-    md5: e5b72b99c896b3b2c92520726a13ad37
-    sha256: 5faa13f659a3be86dde3bda43de2beee8d588f96011694d3d390c1e7e53e7c9d
-  build: he032580_7
+    md5: 56881dea8f76b30caa3f2afd9783a229
+    sha256: 176dd33dbcb4a3a4ed375cdf654598e77f9034ea3a323e6745ec1d87901e66f6
+  build: h56d495d_8
   arch: x86_64
   subdir: win-64
-  build_number: 7
+  build_number: 8
   license: Apache-2.0
   license_family: Apache
-  size: 158540
-  timestamp: 1699363418327
+  size: 159731
+  timestamp: 1699548539297
 - platform: linux-64
   name: aws-c-mqtt
-  version: 0.9.8
+  version: 0.9.9
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - libgcc-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-mqtt-0.9.8-ha08d473_2.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-mqtt-0.9.9-h1387108_0.conda
   hash:
-    md5: 46b993e00e67389a5dec3e17f994553f
-    sha256: 01f6065480966df906d07be6842cfd9d11860623f47ade7d0f7c1ef58b5bc64c
-  build: ha08d473_2
+    md5: d03181571be036cfbe7accf52256efe7
+    sha256: 1df6ad0f5db319090718f5d4575b8829ff5aa5b663c8580e191fa9005e71072d
+  build: h1387108_0
   arch: x86_64
   subdir: linux-64
-  build_number: 2
+  build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 162491
-  timestamp: 1699548592400
+  size: 163679
+  timestamp: 1699585384425
 - platform: osx-64
   name: aws-c-mqtt
-  version: 0.9.8
+  version: 0.9.9
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-mqtt-0.9.8-h5727053_2.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-mqtt-0.9.9-h5e4a26e_0.conda
   hash:
-    md5: 5ae5d4aaf1c82ea82fd9c70bbc68f543
-    sha256: a6cc94e058539c53c6b83a911461320f71c3db2c31a72aaa6e4a8ac8539f4e0e
-  build: h5727053_2
+    md5: 61eba6810125f2214ad6863bf8941c4e
+    sha256: e1812608ca7587561a7c8584c9c202404bfdf2d6f2e8f135fda92f5abf1556a4
+  build: h5e4a26e_0
   arch: x86_64
   subdir: osx-64
-  build_number: 2
+  build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 138464
-  timestamp: 1699548792108
+  size: 139093
+  timestamp: 1699585537317
 - platform: osx-arm64
   name: aws-c-mqtt
-  version: 0.9.8
+  version: 0.9.9
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-mqtt-0.9.8-h31ffd85_2.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-mqtt-0.9.9-h2364c62_0.conda
   hash:
-    md5: d1065557cd6ae8b94bd258b6424a145d
-    sha256: d2165731873130ab8468b78de6ff79c87986794bd5cf989bb054e0b5d0756479
-  build: h31ffd85_2
+    md5: f6fa220e8b10a832127be45ddb7f6f04
+    sha256: f82dd9660edecf32482004d98a09ed6b2929cb3787be43e54f5db71be1d08b62
+  build: h2364c62_0
   arch: aarch64
   subdir: osx-arm64
-  build_number: 2
+  build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 117623
-  timestamp: 1699548697243
+  size: 117617
+  timestamp: 1699585248460
 - platform: win-64
   name: aws-c-mqtt
-  version: 0.9.8
+  version: 0.9.9
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-mqtt-0.9.8-h488a239_2.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-mqtt-0.9.9-hd1ff352_0.conda
   hash:
-    md5: 6a4f0be04a20c987b5cc80d546b3e8e7
-    sha256: ae8a6bd2115401b8bcf8dbab084442480e87fd5a9fa4dbdee1c27dd8bc04d7c2
-  build: h488a239_2
+    md5: 654d96c26cf802b5140edf39b8c59965
+    sha256: 29c5dcd039ef6c18da4cccf219dd6ec19bf4f8496f935212efacc4cadf23e197
+  build: hd1ff352_0
   arch: x86_64
   subdir: win-64
-  build_number: 2
+  build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 157480
-  timestamp: 1699549135684
+  size: 157890
+  timestamp: 1699585731776
 - platform: linux-64
   name: aws-c-s3
-  version: 0.3.22
+  version: 0.3.23
   category: main
   manager: conda
   dependencies:
-  - aws-c-auth >=0.7.5,<0.7.6.0a0
+  - aws-c-auth >=0.7.6,<0.7.7.0a0
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - aws-checksums >=0.1.17,<0.1.18.0a0
   - libgcc-ng >=12
   - openssl >=3.1.4,<4.0a0
-  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-s3-0.3.22-h74ef7d6_2.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-s3-0.3.23-h7630044_1.conda
   hash:
-    md5: db8455c67955447be03d75aca4c67c29
-    sha256: 52cbb45d2e435f09214b4c9dde81cd5d863ff7b282aa29c7ab7458da27b02ab7
-  build: h74ef7d6_2
+    md5: 76eebe9871477c883d04042758493b98
+    sha256: a145f456f0a47f8f7482ce6c23f4bfc3b71cb013598d4e1294930dcc8db56c65
+  build: h7630044_1
   arch: x86_64
   subdir: linux-64
-  build_number: 2
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
-  size: 88140
-  timestamp: 1699561386406
+  size: 90213
+  timestamp: 1699715186317
 - platform: osx-64
   name: aws-c-s3
-  version: 0.3.22
+  version: 0.3.23
   category: main
   manager: conda
   dependencies:
-  - aws-c-auth >=0.7.5,<0.7.6.0a0
+  - aws-c-auth >=0.7.6,<0.7.7.0a0
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - aws-checksums >=0.1.17,<0.1.18.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-s3-0.3.22-hf862c59_2.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-s3-0.3.23-hb1cbb54_1.conda
   hash:
-    md5: e1ca14384968cee866d7302682438db5
-    sha256: 78d97571ef3162f7d8ef7034c7972bbe70f52fbe67ec195074c2ca7f0cff6f2e
-  build: hf862c59_2
+    md5: dfea24cf0289adc80d7aa3bb562a58af
+    sha256: 2fba093610426d453350e335a69c33edb48ab30efcdb5a6191d583b5e36b5014
+  build: hb1cbb54_1
   arch: x86_64
   subdir: osx-64
-  build_number: 2
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
-  size: 76506
-  timestamp: 1699561709060
+  size: 77961
+  timestamp: 1699715318050
 - platform: osx-arm64
   name: aws-c-s3
-  version: 0.3.22
+  version: 0.3.23
   category: main
   manager: conda
   dependencies:
-  - aws-c-auth >=0.7.5,<0.7.6.0a0
+  - aws-c-auth >=0.7.6,<0.7.7.0a0
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - aws-checksums >=0.1.17,<0.1.18.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-s3-0.3.22-h0be9375_2.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-s3-0.3.23-h3940a1a_1.conda
   hash:
-    md5: 7abf8ef7a90ff9168ba2abb7871a9ba9
-    sha256: c22fc3b6c15ba0598aec6880b79b29c91404b5b67ee3a203246bc1bfce6e8edf
-  build: h0be9375_2
+    md5: aebb27ad20745412030f68c42f9eb20d
+    sha256: 9faee6856651595fbd1408e73534109c723a154a03c6d21a34f2e1b59c7d11a1
+  build: h3940a1a_1
   arch: aarch64
   subdir: osx-arm64
-  build_number: 2
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
-  size: 76028
-  timestamp: 1699561750338
+  size: 77576
+  timestamp: 1699715380097
 - platform: win-64
   name: aws-c-s3
-  version: 0.3.22
+  version: 0.3.23
   category: main
   manager: conda
   dependencies:
-  - aws-c-auth >=0.7.5,<0.7.6.0a0
+  - aws-c-auth >=0.7.6,<0.7.7.0a0
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
   - aws-checksums >=0.1.17,<0.1.18.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-s3-0.3.22-h5a4ae1a_2.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-s3-0.3.23-hec067e0_1.conda
   hash:
-    md5: ba86e203a57ddd7e5b8df24cd07e6529
-    sha256: 052b62f919449e7419bfac8aca672386dfb17ab373ed92fed41152d624712828
-  build: h5a4ae1a_2
+    md5: 75e8b0fa90aeed6e17f7a9ff1d2e3572
+    sha256: aef36f85d447ab66d2077a4cbb9fa559ddc5f2435763555057ec02a3896a3c50
+  build: hec067e0_1
   arch: x86_64
   subdir: win-64
-  build_number: 2
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
-  size: 85140
-  timestamp: 1699561967299
+  size: 87706
+  timestamp: 1699715424818
 - platform: linux-64
   name: aws-c-sdkutils
   version: 0.1.12
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - libgcc-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-sdkutils-0.1.12-h3e65c2a_4.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-sdkutils-0.1.12-hfd9eb17_5.conda
   hash:
-    md5: 5fcc2df6693583ee38eb075555956392
-    sha256: 2041b37443b686aa60ca6b34ae86e54af6458c23e0bbc32de1ea0665eb191789
-  build: h3e65c2a_4
+    md5: af2bccdb4cf6e9254969426fd53c7c65
+    sha256: d109677012abbf7e062d2a64c0df55523b056e74e5895650841b49f7f94a48a1
+  build: hfd9eb17_5
   arch: x86_64
   subdir: linux-64
-  build_number: 4
+  build_number: 5
   license: Apache-2.0
   license_family: Apache
-  size: 53076
-  timestamp: 1698710311053
+  size: 53050
+  timestamp: 1699540560421
 - platform: osx-64
   name: aws-c-sdkutils
   version: 0.1.12
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-sdkutils-0.1.12-ha78fcfa_4.conda
+  - aws-c-common >=0.9.8,<0.9.9.0a0
+  url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-sdkutils-0.1.12-hff1f2c8_5.conda
   hash:
-    md5: e309c5244f3912ac92a0b2313b2d5876
-    sha256: 0e417e207f96f3d588c0be748bfaf42ab0d94636cbf17a2fd5051ea7a41cdbf1
-  build: ha78fcfa_4
+    md5: 12164ac8e33917c5d6aeb25ab82c2771
+    sha256: 6953db4c9d56a367f921efaac18cf310985bc57ebd7ed50757c916912a99eeed
+  build: hff1f2c8_5
   arch: x86_64
   subdir: osx-64
-  build_number: 4
+  build_number: 5
   license: Apache-2.0
   license_family: Apache
-  size: 47404
-  timestamp: 1698710545856
+  size: 47222
+  timestamp: 1699540725086
 - platform: osx-arm64
   name: aws-c-sdkutils
   version: 0.1.12
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-sdkutils-0.1.12-he63e28a_4.conda
+  - aws-c-common >=0.9.8,<0.9.9.0a0
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-sdkutils-0.1.12-hea61927_5.conda
   hash:
-    md5: b7fad8d42a716920a4c6cee7d97a6be3
-    sha256: 584db23dd2d577445929572c4330863735fb4d27523abd1bc697379bf00fdce5
-  build: he63e28a_4
+    md5: 905d930730d618d5632011cb68d6744d
+    sha256: a1c60064bf93b4ddbc223bf494acb3e295b0846eb887017d435816e1bcfc51e5
+  build: hea61927_5
   arch: aarch64
   subdir: osx-arm64
-  build_number: 4
+  build_number: 5
   license: Apache-2.0
   license_family: Apache
-  size: 46919
-  timestamp: 1698710580834
+  size: 46881
+  timestamp: 1699541048893
 - platform: win-64
   name: aws-c-sdkutils
   version: 0.1.12
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-sdkutils-0.1.12-h6f45060_4.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/aws-c-sdkutils-0.1.12-hde771f8_5.conda
   hash:
-    md5: 2ed18bb39f2e35b0de017637b4e267f3
-    sha256: 976e697ca7d9e85fd6291f4d047a353fc750bc1f10331134d72ca1cef186fc75
-  build: h6f45060_4
+    md5: 63d2fb4a9fbff5b3fd1bcf958d616533
+    sha256: 7c059bfaf81900c86d7e9033efe1d45486db3bbd095729fd431d4a805994bc49
+  build: hde771f8_5
   arch: x86_64
   subdir: win-64
-  build_number: 4
+  build_number: 5
   license: Apache-2.0
   license_family: Apache
-  size: 51749
-  timestamp: 1698710874007
+  size: 51783
+  timestamp: 1699540935579
 - platform: linux-64
   name: aws-checksums
   version: 0.1.17
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - libgcc-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/aws-checksums-0.1.17-h3e65c2a_4.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/aws-checksums-0.1.17-hfd9eb17_5.conda
   hash:
-    md5: c01f89cb1a7ed2e1f37a72ffede9b870
-    sha256: fa7b6bd4557d117c3d8667166c7011e8df8423602eeeb734ec096897b77ec50b
-  build: h3e65c2a_4
+    md5: 92077b8c5f72e9b81f069b1eb492ab80
+    sha256: fa197cea5d34038066ac743ffa3ae688c057152fff55226ec740c5f68a136282
+  build: hfd9eb17_5
   arch: x86_64
   subdir: linux-64
-  build_number: 4
+  build_number: 5
   license: Apache-2.0
   license_family: Apache
-  size: 50231
-  timestamp: 1698710226989
+  size: 49997
+  timestamp: 1699540353416
 - platform: osx-64
   name: aws-checksums
   version: 0.1.17
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/aws-checksums-0.1.17-ha78fcfa_4.conda
+  - aws-c-common >=0.9.8,<0.9.9.0a0
+  url: https://conda.anaconda.org/conda-forge/osx-64/aws-checksums-0.1.17-hff1f2c8_5.conda
   hash:
-    md5: 6e6254ef456413dfee737de75fd419bb
-    sha256: 6c34fe8de60d70ad5cdf19e3a90a68e61f4007b68e6c66eea2ee73dfb7bdce84
-  build: ha78fcfa_4
+    md5: 8b47ddfddaf30b4de34ea9d660c919c7
+    sha256: 8ebb4ac6617f87405b6966a23dc4a37bdc96d4627f990e72abf1dff136179579
+  build: hff1f2c8_5
   arch: x86_64
   subdir: osx-64
-  build_number: 4
+  build_number: 5
   license: Apache-2.0
   license_family: Apache
-  size: 48771
-  timestamp: 1698710387219
+  size: 48734
+  timestamp: 1699540654287
 - platform: osx-arm64
   name: aws-checksums
   version: 0.1.17
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-checksums-0.1.17-he63e28a_4.conda
+  - aws-c-common >=0.9.8,<0.9.9.0a0
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-checksums-0.1.17-hea61927_5.conda
   hash:
-    md5: 137e2a6fbd1a9af10327431a058995ea
-    sha256: 01a7df193c9f5ed33094d228cb58af8bf5975d369c8da2271756fad0914eef7c
-  build: he63e28a_4
+    md5: 4fcd94ba7456d0d162d3d84e5ef4db54
+    sha256: 72af0036cdb7492826fafe1513cc5f0aa0280ad5d5af4a9ebbca50b81920cbe6
+  build: hea61927_5
   arch: aarch64
   subdir: osx-arm64
-  build_number: 4
+  build_number: 5
   license: Apache-2.0
   license_family: Apache
-  size: 49162
-  timestamp: 1698710623741
+  size: 49092
+  timestamp: 1699540725982
 - platform: win-64
   name: aws-checksums
   version: 0.1.17
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/aws-checksums-0.1.17-h6f45060_4.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/aws-checksums-0.1.17-hde771f8_5.conda
   hash:
-    md5: 586ec2148c315b5cb6833999a894dae8
-    sha256: ada1fa9736841e568f15ba015d200deaaa4a7f33acbaa36309d490037aee6970
-  build: h6f45060_4
+    md5: 0085fd1d337cc977c15c4305164e6301
+    sha256: 874eab0a384b371f327a55638260023cdad23857ca736c7f28dd6dcaa173209c
+  build: hde771f8_5
   arch: x86_64
   subdir: win-64
-  build_number: 4
+  build_number: 5
   license: Apache-2.0
   license_family: Apache
-  size: 52227
-  timestamp: 1698710697630
+  size: 52206
+  timestamp: 1699540872454
 - platform: linux-64
   name: aws-crt-cpp
-  version: 0.24.5
+  version: 0.24.6
   category: main
   manager: conda
   dependencies:
-  - aws-c-auth >=0.7.5,<0.7.6.0a0
+  - aws-c-auth >=0.7.6,<0.7.7.0a0
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-event-stream >=0.3.2,<0.3.3.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
-  - aws-c-mqtt >=0.9.8,<0.9.9.0a0
-  - aws-c-s3 >=0.3.22,<0.3.23.0a0
+  - aws-c-mqtt >=0.9.9,<0.9.10.0a0
+  - aws-c-s3 >=0.3.23,<0.3.24.0a0
   - aws-c-sdkutils >=0.1.12,<0.1.13.0a0
   - libgcc-ng >=12
   - libstdcxx-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/aws-crt-cpp-0.24.5-h48a4155_1.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/aws-crt-cpp-0.24.6-h270613d_0.conda
   hash:
-    md5: e5e36577dce77a90cefe999136833e18
-    sha256: ce4ddf0ca2d42c8919504c190848ae579b949d0c1f15790948a18a53afcb1f07
-  build: h48a4155_1
+    md5: 6c72523113e6bdb0b70e521f8e21f122
+    sha256: 850b00b1b7de5cce9e6e2af9fa8f69ae804e8778a3bc7b3b3eed0a194b1e206e
+  build: h270613d_0
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 327298
-  timestamp: 1699576000021
+  size: 325484
+  timestamp: 1699827131561
 - platform: osx-64
   name: aws-crt-cpp
-  version: 0.24.5
+  version: 0.24.6
   category: main
   manager: conda
   dependencies:
   - __osx >=10.9
-  - aws-c-auth >=0.7.5,<0.7.6.0a0
+  - aws-c-auth >=0.7.6,<0.7.7.0a0
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-event-stream >=0.3.2,<0.3.3.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
-  - aws-c-mqtt >=0.9.8,<0.9.9.0a0
-  - aws-c-s3 >=0.3.22,<0.3.23.0a0
+  - aws-c-mqtt >=0.9.9,<0.9.10.0a0
+  - aws-c-s3 >=0.3.23,<0.3.24.0a0
   - aws-c-sdkutils >=0.1.12,<0.1.13.0a0
   - libcxx >=16.0.6
-  url: https://conda.anaconda.org/conda-forge/osx-64/aws-crt-cpp-0.24.5-h4eb6da0_1.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/aws-crt-cpp-0.24.6-h7eda119_0.conda
   hash:
-    md5: 2981fb88e349aa0140e4fca3929a78ab
-    sha256: d1503553ac58e73d34880dfa4a98906bf9ff47e6cf2b3ff7177e1f5bb5512196
-  build: h4eb6da0_1
+    md5: f1e9885e6e8c37329493456d3f3741e3
+    sha256: 8c6a4987c2db07fff1b519ea7b98224a511894ef8abee464e6428b8405e23bf2
+  build: h7eda119_0
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 274767
-  timestamp: 1699576356780
+  size: 274300
+  timestamp: 1699827382342
 - platform: osx-arm64
   name: aws-crt-cpp
-  version: 0.24.5
+  version: 0.24.6
   category: main
   manager: conda
   dependencies:
   - __osx >=10.9
-  - aws-c-auth >=0.7.5,<0.7.6.0a0
+  - aws-c-auth >=0.7.6,<0.7.7.0a0
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-event-stream >=0.3.2,<0.3.3.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
-  - aws-c-mqtt >=0.9.8,<0.9.9.0a0
-  - aws-c-s3 >=0.3.22,<0.3.23.0a0
+  - aws-c-mqtt >=0.9.9,<0.9.10.0a0
+  - aws-c-s3 >=0.3.23,<0.3.24.0a0
   - aws-c-sdkutils >=0.1.12,<0.1.13.0a0
   - libcxx >=16.0.6
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-crt-cpp-0.24.5-h142c802_1.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-crt-cpp-0.24.6-h8bfa36e_0.conda
   hash:
-    md5: 0805dfc4f9746831943e05a60da82b85
-    sha256: 6c85761c2c5d08bff18440401fa135bd9243336f1e0b1a181f90e5db4eb3d02d
-  build: h142c802_1
+    md5: 1308c70773a563087be5e8a70990692e
+    sha256: 7dc05da7d817dcfe25e0cf5053e99b6cecf449bd4941e0a78611c172595aafb2
+  build: h8bfa36e_0
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 213030
-  timestamp: 1699576289227
+  size: 212956
+  timestamp: 1699827346801
 - platform: win-64
   name: aws-crt-cpp
-  version: 0.24.5
+  version: 0.24.6
   category: main
   manager: conda
   dependencies:
-  - aws-c-auth >=0.7.5,<0.7.6.0a0
+  - aws-c-auth >=0.7.6,<0.7.7.0a0
   - aws-c-cal >=0.6.9,<0.6.10.0a0
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-event-stream >=0.3.2,<0.3.3.0a0
   - aws-c-http >=0.7.14,<0.7.15.0a0
   - aws-c-io >=0.13.35,<0.13.36.0a0
-  - aws-c-mqtt >=0.9.8,<0.9.9.0a0
-  - aws-c-s3 >=0.3.22,<0.3.23.0a0
+  - aws-c-mqtt >=0.9.9,<0.9.10.0a0
+  - aws-c-s3 >=0.3.23,<0.3.24.0a0
   - aws-c-sdkutils >=0.1.12,<0.1.13.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/aws-crt-cpp-0.24.5-he0af546_1.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/aws-crt-cpp-0.24.6-hb03f413_0.conda
   hash:
-    md5: 031bcdcd1b218031f289ffa053560dd8
-    sha256: 6946957ca5255d536d20bc26b74df6a8c51b11e711ab7ab9d916626b490936d6
-  build: he0af546_1
+    md5: 804fbdc65423422f9d7866e3a2a32cf6
+    sha256: c293d2d50ec79bcd9601d2db4567ffc2e95bd28c9c5b1ab4ffa88b5295a0b264
+  build: hb03f413_0
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 0
   license: Apache-2.0
   license_family: Apache
-  size: 237104
-  timestamp: 1699576259324
+  size: 237639
+  timestamp: 1699827375830
 - platform: linux-64
   name: aws-sdk-cpp
   version: 1.11.182
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-event-stream >=0.3.2,<0.3.3.0a0
   - aws-checksums >=0.1.17,<0.1.18.0a0
-  - aws-crt-cpp >=0.24.5,<0.24.6.0a0
+  - aws-crt-cpp >=0.24.6,<0.24.7.0a0
   - libcurl >=8.4.0,<9.0a0
   - libgcc-ng >=12
   - libstdcxx-ng >=12
   - libzlib >=1.2.13,<1.3.0a0
   - openssl >=3.1.4,<4.0a0
-  url: https://conda.anaconda.org/conda-forge/linux-64/aws-sdk-cpp-1.11.182-h2b8e6fb_4.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/aws-sdk-cpp-1.11.182-h771f7cb_6.conda
   hash:
-    md5: 804fb841eea68c47961461df8797c197
-    sha256: abb165dd2fd1f461cd83f6ef5e1632b0b4feb7fc912c7d67baafe3a36cf49f37
-  build: h2b8e6fb_4
+    md5: d7bdd7c6458cbfdbca8246d6687c9e87
+    sha256: 5a44a81fd9a1091edcee9dac57f2df34d213a0318ad71bfb838b17480baa627e
+  build: h771f7cb_6
   arch: x86_64
   subdir: linux-64
-  build_number: 4
+  build_number: 6
   license: Apache-2.0
   license_family: Apache
-  size: 3444820
-  timestamp: 1699443413009
+  size: 3439081
+  timestamp: 1699910664991
 - platform: osx-64
   name: aws-sdk-cpp
   version: 1.11.182
@@ -1939,26 +2024,26 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-event-stream >=0.3.2,<0.3.3.0a0
   - aws-checksums >=0.1.17,<0.1.18.0a0
-  - aws-crt-cpp >=0.24.5,<0.24.6.0a0
+  - aws-crt-cpp >=0.24.6,<0.24.7.0a0
   - libcurl >=8.4.0,<9.0a0
   - libcxx >=16.0.6
   - libzlib >=1.2.13,<1.3.0a0
   - openssl >=3.1.4,<4.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/aws-sdk-cpp-1.11.182-h8a7c8da_4.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/aws-sdk-cpp-1.11.182-h06c5342_6.conda
   hash:
-    md5: 702f9438f2b9e754a0657a3024bd05a2
-    sha256: 307a84c04bcec2b0ea9b70a2466c9a6f3a28d4e9aea686db5d1fca84464248b3
-  build: h8a7c8da_4
+    md5: 57a340066ffd1526abc6a946d7faf8ef
+    sha256: 308e26554c9deeb0b11e54f013d6e05c5ebd0aca283f86f94fd0771871bf6af7
+  build: h06c5342_6
   arch: x86_64
   subdir: osx-64
-  build_number: 4
+  build_number: 6
   license: Apache-2.0
   license_family: Apache
-  size: 3164674
-  timestamp: 1699443981539
+  size: 3170501
+  timestamp: 1699911606669
 - platform: osx-arm64
   name: aws-sdk-cpp
   version: 1.11.182
@@ -1966,52 +2051,52 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-event-stream >=0.3.2,<0.3.3.0a0
   - aws-checksums >=0.1.17,<0.1.18.0a0
-  - aws-crt-cpp >=0.24.5,<0.24.6.0a0
+  - aws-crt-cpp >=0.24.6,<0.24.7.0a0
   - libcurl >=8.4.0,<9.0a0
   - libcxx >=16.0.6
   - libzlib >=1.2.13,<1.3.0a0
   - openssl >=3.1.4,<4.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-sdk-cpp-1.11.182-h0c1a885_4.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-sdk-cpp-1.11.182-hb9aa301_6.conda
   hash:
-    md5: 4a69ed767d116ecf65943436ed6a8623
-    sha256: fd13b7aa184d8bb3135c70a53c5e076d7b38461d737f49ca198e3b835af71469
-  build: h0c1a885_4
+    md5: d59256fce1d063750aa34b535ca08bd2
+    sha256: 2d447acabb91224811de2967797ed5eb3239f6034a977fbd1823da3cf05aa8bb
+  build: hb9aa301_6
   arch: aarch64
   subdir: osx-arm64
-  build_number: 4
+  build_number: 6
   license: Apache-2.0
   license_family: Apache
-  size: 3182890
-  timestamp: 1699444269012
+  size: 3219725
+  timestamp: 1699911471167
 - platform: win-64
   name: aws-sdk-cpp
   version: 1.11.182
   category: main
   manager: conda
   dependencies:
-  - aws-c-common >=0.9.5,<0.9.6.0a0
+  - aws-c-common >=0.9.8,<0.9.9.0a0
   - aws-c-event-stream >=0.3.2,<0.3.3.0a0
   - aws-checksums >=0.1.17,<0.1.18.0a0
-  - aws-crt-cpp >=0.24.5,<0.24.6.0a0
+  - aws-crt-cpp >=0.24.6,<0.24.7.0a0
   - libzlib >=1.2.13,<1.3.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/aws-sdk-cpp-1.11.182-hf4894ff_4.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/aws-sdk-cpp-1.11.182-h0652cf5_6.conda
   hash:
-    md5: 27b9c5f743fd82c166445d1c02c3cebc
-    sha256: 794bf88e22b1b617340b3f993d30739cc5a3e4402f446aaa2f107b094641e4d6
-  build: hf4894ff_4
+    md5: 7e7e5f9119bca8bdd0b10a1d07ba8e3c
+    sha256: 508d8905b2c5a6be71c04c1047396449fc60f611cb6b2cdab0ba7e59251c0f50
+  build: h0652cf5_6
   arch: x86_64
   subdir: win-64
-  build_number: 4
+  build_number: 6
   license: Apache-2.0
   license_family: Apache
-  size: 3237710
-  timestamp: 1699444829349
+  size: 3244055
+  timestamp: 1699911997206
 - platform: linux-64
   name: babel
   version: 2.13.1
@@ -5140,6 +5225,7 @@ package:
   subdir: linux-64
   build_number: 0
   license: MIT
+  license_family: MIT
   noarch: python
   size: 68788
   timestamp: 1699472354004
@@ -5171,6 +5257,7 @@ package:
   subdir: osx-64
   build_number: 0
   license: MIT
+  license_family: MIT
   noarch: python
   size: 68788
   timestamp: 1699472354004
@@ -5202,6 +5289,7 @@ package:
   subdir: osx-arm64
   build_number: 0
   license: MIT
+  license_family: MIT
   noarch: python
   size: 68788
   timestamp: 1699472354004
@@ -5233,6 +5321,7 @@ package:
   subdir: win-64
   build_number: 0
   license: MIT
+  license_family: MIT
   noarch: python
   size: 68788
   timestamp: 1699472354004
@@ -7460,25 +7549,25 @@ package:
   dependencies:
   - hdf5 >=1.14.2,<1.14.3.0a0
   - libgcc-ng >=12
-  - libgdal 3.7.3 h6f3d308_2
+  - libgdal 3.7.3 h6f3d308_3
   - libstdcxx-ng >=12
   - libxml2 >=2.11.5,<2.12.0a0
   - numpy >=1.26.0,<2.0a0
   - openssl >=3.1.4,<4.0a0
   - python >=3.12,<3.13.0a0
   - python_abi 3.12.* *_cp312
-  url: https://conda.anaconda.org/conda-forge/linux-64/gdal-3.7.3-py312ha5e4baf_2.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/gdal-3.7.3-py312ha5e4baf_3.conda
   hash:
-    md5: a6dc2692f3c1a1902dba33801a5a6492
-    sha256: d58a467c820eaf08b9b842f3113b27dc652ae0574b02b5e4b2535e4b18213469
-  build: py312ha5e4baf_2
+    md5: 9c16f71a28dfe77b52d703071ad40793
+    sha256: 4d706ff072e6de8fa267339f2f2bce75aff95dfb619003ef4515255a410da36b
+  build: py312ha5e4baf_3
   arch: x86_64
   subdir: linux-64
-  build_number: 2
+  build_number: 3
   license: MIT
   license_family: MIT
-  size: 1608649
-  timestamp: 1699112655186
+  size: 1610301
+  timestamp: 1699853974958
 - platform: osx-64
   name: gdal
   version: 3.7.3
@@ -7488,24 +7577,24 @@ package:
   - __osx >=10.9
   - hdf5 >=1.14.2,<1.14.3.0a0
   - libcxx >=16.0.6
-  - libgdal 3.7.3 h926149b_2
+  - libgdal 3.7.3 h926149b_3
   - libxml2 >=2.11.5,<2.12.0a0
   - numpy >=1.26.0,<2.0a0
   - openssl >=3.1.4,<4.0a0
   - python >=3.12,<3.13.0a0
   - python_abi 3.12.* *_cp312
-  url: https://conda.anaconda.org/conda-forge/osx-64/gdal-3.7.3-py312hffe8f62_2.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/gdal-3.7.3-py312hffe8f62_3.conda
   hash:
-    md5: b87becfad0953df5a17e3071f78432ef
-    sha256: 7b6a16bf1456db4d54bd258beaa9ee8d8145794ef00e744a1f92e9deb738aeb9
-  build: py312hffe8f62_2
+    md5: de4aec4a0833a2cae892ae9fda75db1a
+    sha256: 4f86ded3d40e2efa5fdc227408b15eba1681609c58c188778a5f0b305d3ef05e
+  build: py312hffe8f62_3
   arch: x86_64
   subdir: osx-64
-  build_number: 2
+  build_number: 3
   license: MIT
   license_family: MIT
-  size: 1614997
-  timestamp: 1699113690727
+  size: 1617318
+  timestamp: 1699855565261
 - platform: osx-arm64
   name: gdal
   version: 3.7.3
@@ -7515,25 +7604,25 @@ package:
   - __osx >=10.9
   - hdf5 >=1.14.2,<1.14.3.0a0
   - libcxx >=16.0.6
-  - libgdal 3.7.3 h116f65a_2
+  - libgdal 3.7.3 h116f65a_3
   - libxml2 >=2.11.5,<2.12.0a0
   - numpy >=1.26.0,<2.0a0
   - openssl >=3.1.4,<4.0a0
   - python >=3.12,<3.13.0a0
   - python >=3.12,<3.13.0a0 *_cpython
   - python_abi 3.12.* *_cp312
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.7.3-py312hb8631af_2.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.7.3-py312hb8631af_3.conda
   hash:
-    md5: 160018cb378637012fc238edc77dd75b
-    sha256: a38781d38d0cf1be56dc16c2bbb9797a5b9847a9ee41bc39428ed96ea9143099
-  build: py312hb8631af_2
+    md5: 2a75bc9f3cd6c3897588c2aa68b82ecd
+    sha256: fe6375b9dbd576f7d1004837d4f37a45b1feb13fa36ebb8a42985776e455e822
+  build: py312hb8631af_3
   arch: aarch64
   subdir: osx-arm64
-  build_number: 2
+  build_number: 3
   license: MIT
   license_family: MIT
-  size: 1605262
-  timestamp: 1699114195935
+  size: 1601676
+  timestamp: 1699856252967
 - platform: win-64
   name: gdal
   version: 3.7.3
@@ -7541,7 +7630,7 @@ package:
   manager: conda
   dependencies:
   - hdf5 >=1.14.2,<1.14.3.0a0
-  - libgdal 3.7.3 h3217549_2
+  - libgdal 3.7.3 h3217549_3
   - libxml2 >=2.11.5,<2.12.0a0
   - numpy >=1.26.0,<2.0a0
   - openssl >=3.1.4,<4.0a0
@@ -7550,18 +7639,18 @@ package:
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/gdal-3.7.3-py312hb5f3cee_2.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/gdal-3.7.3-py312hb5f3cee_3.conda
   hash:
-    md5: 44b247ad5dd78526118d2f11499e513d
-    sha256: 9531ce5a201934310c4e5631c59ed0ee890efb6cbea0ef68bbfc05882bd65507
-  build: py312hb5f3cee_2
+    md5: 878d8afc7ddeacd0c4f4f2d307c2a6f8
+    sha256: e2bd819aa7cc9277c5dfe18470f45ef6493b3aeefeb475de582ccaac076811d8
+  build: py312hb5f3cee_3
   arch: x86_64
   subdir: win-64
-  build_number: 2
+  build_number: 3
   license: MIT
   license_family: MIT
-  size: 1583192
-  timestamp: 1699114017195
+  size: 1581741
+  timestamp: 1699856150751
 - platform: linux-64
   name: genson
   version: 1.2.2
@@ -7644,115 +7733,115 @@ package:
   timestamp: 1601490140447
 - platform: linux-64
   name: geopandas
-  version: 0.14.0
+  version: 0.14.1
   category: main
   manager: conda
   dependencies:
   - fiona >=1.8.21
   - folium
-  - geopandas-base 0.14.0 pyha770c72_1
+  - geopandas-base 0.14.1 pyha770c72_0
   - mapclassify >=2.4.0
   - matplotlib-base
   - python >=3.9
   - rtree
   - xyzservices
-  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-0.14.0-pyhd8ed1ab_1.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-0.14.1-pyhd8ed1ab_0.conda
   hash:
-    md5: d3617cddba7ea3dd3234d28faa3bc3b4
-    sha256: 2acdc39438b7152da0a08b3daad9b5b066d7b6005beb4cb176c0ef654ef79668
-  build: pyhd8ed1ab_1
+    md5: 6ce5f89fb1e2aa7e04d12c0008b3a745
+    sha256: f3563ad6f1a55587c097337ece863e583c796c9a9df3ecb396bbfeec4ec309fb
+  build: pyhd8ed1ab_0
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 7566
-  timestamp: 1697032162340
+  size: 7525
+  timestamp: 1699712300019
 - platform: osx-64
   name: geopandas
-  version: 0.14.0
+  version: 0.14.1
   category: main
   manager: conda
   dependencies:
   - fiona >=1.8.21
   - folium
-  - geopandas-base 0.14.0 pyha770c72_1
+  - geopandas-base 0.14.1 pyha770c72_0
   - mapclassify >=2.4.0
   - matplotlib-base
   - python >=3.9
   - rtree
   - xyzservices
-  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-0.14.0-pyhd8ed1ab_1.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-0.14.1-pyhd8ed1ab_0.conda
   hash:
-    md5: d3617cddba7ea3dd3234d28faa3bc3b4
-    sha256: 2acdc39438b7152da0a08b3daad9b5b066d7b6005beb4cb176c0ef654ef79668
-  build: pyhd8ed1ab_1
+    md5: 6ce5f89fb1e2aa7e04d12c0008b3a745
+    sha256: f3563ad6f1a55587c097337ece863e583c796c9a9df3ecb396bbfeec4ec309fb
+  build: pyhd8ed1ab_0
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 7566
-  timestamp: 1697032162340
+  size: 7525
+  timestamp: 1699712300019
 - platform: osx-arm64
   name: geopandas
-  version: 0.14.0
+  version: 0.14.1
   category: main
   manager: conda
   dependencies:
   - fiona >=1.8.21
   - folium
-  - geopandas-base 0.14.0 pyha770c72_1
+  - geopandas-base 0.14.1 pyha770c72_0
   - mapclassify >=2.4.0
   - matplotlib-base
   - python >=3.9
   - rtree
   - xyzservices
-  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-0.14.0-pyhd8ed1ab_1.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-0.14.1-pyhd8ed1ab_0.conda
   hash:
-    md5: d3617cddba7ea3dd3234d28faa3bc3b4
-    sha256: 2acdc39438b7152da0a08b3daad9b5b066d7b6005beb4cb176c0ef654ef79668
-  build: pyhd8ed1ab_1
+    md5: 6ce5f89fb1e2aa7e04d12c0008b3a745
+    sha256: f3563ad6f1a55587c097337ece863e583c796c9a9df3ecb396bbfeec4ec309fb
+  build: pyhd8ed1ab_0
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 7566
-  timestamp: 1697032162340
+  size: 7525
+  timestamp: 1699712300019
 - platform: win-64
   name: geopandas
-  version: 0.14.0
+  version: 0.14.1
   category: main
   manager: conda
   dependencies:
   - fiona >=1.8.21
   - folium
-  - geopandas-base 0.14.0 pyha770c72_1
+  - geopandas-base 0.14.1 pyha770c72_0
   - mapclassify >=2.4.0
   - matplotlib-base
   - python >=3.9
   - rtree
   - xyzservices
-  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-0.14.0-pyhd8ed1ab_1.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-0.14.1-pyhd8ed1ab_0.conda
   hash:
-    md5: d3617cddba7ea3dd3234d28faa3bc3b4
-    sha256: 2acdc39438b7152da0a08b3daad9b5b066d7b6005beb4cb176c0ef654ef79668
-  build: pyhd8ed1ab_1
+    md5: 6ce5f89fb1e2aa7e04d12c0008b3a745
+    sha256: f3563ad6f1a55587c097337ece863e583c796c9a9df3ecb396bbfeec4ec309fb
+  build: pyhd8ed1ab_0
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 7566
-  timestamp: 1697032162340
+  size: 7525
+  timestamp: 1699712300019
 - platform: linux-64
   name: geopandas-base
-  version: 0.14.0
+  version: 0.14.1
   category: main
   manager: conda
   dependencies:
@@ -7761,22 +7850,22 @@ package:
   - pyproj >=3.3.0
   - python >=3.9
   - shapely >=1.8.0
-  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.14.0-pyha770c72_1.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.14.1-pyha770c72_0.conda
   hash:
-    md5: 614a383c5f4350e0606689f54c6497b1
-    sha256: 97fe438e399d9106998e38fc700fdd6f90f15ea92d1e20cf0a01e74436aa24ba
-  build: pyha770c72_1
+    md5: d65c6f458bfdaa181f388d91e858ea67
+    sha256: c813004bb84e50de19f599b188719e40106c858c7da22e504b29ce66e5043361
+  build: pyha770c72_0
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 1017514
-  timestamp: 1697032153699
+  size: 1018566
+  timestamp: 1699712289660
 - platform: osx-64
   name: geopandas-base
-  version: 0.14.0
+  version: 0.14.1
   category: main
   manager: conda
   dependencies:
@@ -7785,22 +7874,22 @@ package:
   - pyproj >=3.3.0
   - python >=3.9
   - shapely >=1.8.0
-  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.14.0-pyha770c72_1.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.14.1-pyha770c72_0.conda
   hash:
-    md5: 614a383c5f4350e0606689f54c6497b1
-    sha256: 97fe438e399d9106998e38fc700fdd6f90f15ea92d1e20cf0a01e74436aa24ba
-  build: pyha770c72_1
+    md5: d65c6f458bfdaa181f388d91e858ea67
+    sha256: c813004bb84e50de19f599b188719e40106c858c7da22e504b29ce66e5043361
+  build: pyha770c72_0
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 1017514
-  timestamp: 1697032153699
+  size: 1018566
+  timestamp: 1699712289660
 - platform: osx-arm64
   name: geopandas-base
-  version: 0.14.0
+  version: 0.14.1
   category: main
   manager: conda
   dependencies:
@@ -7809,22 +7898,22 @@ package:
   - pyproj >=3.3.0
   - python >=3.9
   - shapely >=1.8.0
-  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.14.0-pyha770c72_1.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.14.1-pyha770c72_0.conda
   hash:
-    md5: 614a383c5f4350e0606689f54c6497b1
-    sha256: 97fe438e399d9106998e38fc700fdd6f90f15ea92d1e20cf0a01e74436aa24ba
-  build: pyha770c72_1
+    md5: d65c6f458bfdaa181f388d91e858ea67
+    sha256: c813004bb84e50de19f599b188719e40106c858c7da22e504b29ce66e5043361
+  build: pyha770c72_0
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 1017514
-  timestamp: 1697032153699
+  size: 1018566
+  timestamp: 1699712289660
 - platform: win-64
   name: geopandas-base
-  version: 0.14.0
+  version: 0.14.1
   category: main
   manager: conda
   dependencies:
@@ -7833,19 +7922,19 @@ package:
   - pyproj >=3.3.0
   - python >=3.9
   - shapely >=1.8.0
-  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.14.0-pyha770c72_1.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.14.1-pyha770c72_0.conda
   hash:
-    md5: 614a383c5f4350e0606689f54c6497b1
-    sha256: 97fe438e399d9106998e38fc700fdd6f90f15ea92d1e20cf0a01e74436aa24ba
-  build: pyha770c72_1
+    md5: d65c6f458bfdaa181f388d91e858ea67
+    sha256: c813004bb84e50de19f599b188719e40106c858c7da22e504b29ce66e5043361
+  build: pyha770c72_0
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 1017514
-  timestamp: 1697032153699
+  size: 1018566
+  timestamp: 1699712289660
 - platform: linux-64
   name: geos
   version: 3.12.0
@@ -8463,17 +8552,17 @@ package:
   timestamp: 1689627974018
 - platform: linux-64
   name: gst-plugins-base
-  version: 1.22.6
+  version: 1.22.7
   category: main
   manager: conda
   dependencies:
   - __glibc >=2.17,<3.0.a0
   - alsa-lib >=1.2.10,<1.2.11.0a0
   - gettext >=0.21.1,<1.0a0
-  - gstreamer 1.22.6 h98fc4e7_2
+  - gstreamer 1.22.7 h98fc4e7_0
   - libexpat >=2.5.0,<3.0a0
   - libgcc-ng >=12
-  - libglib >=2.78.0,<3.0a0
+  - libglib >=2.78.1,<3.0a0
   - libogg >=1.3.4,<1.4.0a0
   - libopus >=1.3.1,<2.0a0
   - libpng >=1.6.39,<1.7.0a0
@@ -8481,124 +8570,119 @@ package:
   - libvorbis >=1.3.7,<1.4.0a0
   - libxcb >=1.15,<1.16.0a0
   - libzlib >=1.2.13,<1.3.0a0
-  - xorg-libx11 >=1.8.6,<2.0a0
+  - xorg-libx11 >=1.8.7,<2.0a0
   - xorg-libxau >=1.0.11,<2.0a0
   - xorg-libxext >=1.3.4,<2.0a0
   - xorg-libxrender >=0.9.11,<0.10.0a0
-  url: https://conda.anaconda.org/conda-forge/linux-64/gst-plugins-base-1.22.6-h8e1006c_2.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/gst-plugins-base-1.22.7-h8e1006c_0.conda
   hash:
-    md5: 3d8e98279bad55287f2ef9047996f33c
-    sha256: 07e71ef8ad4d1516695132ed142ef6bc6393243fee54f950aa0944561f2f277f
-  build: h8e1006c_2
+    md5: 065e2c1d49afa3fdc1a01f1dacd6ab09
+    sha256: 190151790cedc719199c783123a9f3ee4e86acd09fee3a6ec33a21cbac20494e
+  build: h8e1006c_0
   arch: x86_64
   subdir: linux-64
-  build_number: 2
+  build_number: 0
   license: LGPL-2.0-or-later
-  license_family: LGPL
-  size: 2704605
-  timestamp: 1696222053755
+  size: 2713065
+  timestamp: 1699936047150
 - platform: win-64
   name: gst-plugins-base
-  version: 1.22.6
+  version: 1.22.7
   category: main
   manager: conda
   dependencies:
   - gettext >=0.21.1,<1.0a0
-  - gstreamer 1.22.6 hb4038d2_2
-  - libglib >=2.78.0,<3.0a0
+  - gstreamer 1.22.7 hb4038d2_0
+  - libglib >=2.78.1,<3.0a0
   - libogg >=1.3.4,<1.4.0a0
   - libvorbis >=1.3.7,<1.4.0a0
   - libzlib >=1.2.13,<1.3.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/gst-plugins-base-1.22.6-h001b923_2.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/gst-plugins-base-1.22.7-h001b923_0.conda
   hash:
-    md5: 20e57b894392cb792cdf5c501b35a8f6
-    sha256: 34816d0335e796ea3610022756b3b0832f5699007adc2819a08e068120dd3a8f
-  build: h001b923_2
+    md5: e4b56ad6c21e861456f32bfc79b43c4b
+    sha256: aa9315d943f1f0c224fbebb72ff802701161d3365415c1ebf3758fac1b5ae214
+  build: h001b923_0
   arch: x86_64
   subdir: win-64
-  build_number: 2
+  build_number: 0
   license: LGPL-2.0-or-later
-  license_family: LGPL
-  size: 2032915
-  timestamp: 1696222439891
+  size: 2035099
+  timestamp: 1699936715537
 - platform: linux-64
   name: gstreamer
-  version: 1.22.6
+  version: 1.22.7
   category: main
   manager: conda
   dependencies:
   - __glibc >=2.17,<3.0.a0
   - gettext >=0.21.1,<1.0a0
-  - glib >=2.78.0,<3.0a0
+  - glib >=2.78.1,<3.0a0
   - libgcc-ng >=12
-  - libglib >=2.78.0,<3.0a0
+  - libglib >=2.78.1,<3.0a0
   - libiconv >=1.17,<2.0a0
   - libstdcxx-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/gstreamer-1.22.6-h98fc4e7_2.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/gstreamer-1.22.7-h98fc4e7_0.conda
   hash:
-    md5: 1c95f7c612f9121353c4ef764678113e
-    sha256: 5578119cec4e86b7b607678781026ebe1170cb851b4f784c49b09bed1c92566c
-  build: h98fc4e7_2
+    md5: 6c919bafe5e03428a8e2ef319d7ef990
+    sha256: d77b2a740acd59c4dd6c9d8fe6e008ee96407b6dcc5cc0b5e27e8c1eec5d22ef
+  build: h98fc4e7_0
   arch: x86_64
   subdir: linux-64
-  build_number: 2
+  build_number: 0
   license: LGPL-2.0-or-later
-  license_family: LGPL
-  size: 1972133
-  timestamp: 1696221935494
+  size: 1977893
+  timestamp: 1699935901784
 - platform: win-64
   name: gstreamer
-  version: 1.22.6
+  version: 1.22.7
   category: main
   manager: conda
   dependencies:
   - gettext >=0.21.1,<1.0a0
-  - glib >=2.78.0,<3.0a0
-  - libglib >=2.78.0,<3.0a0
+  - glib >=2.78.1,<3.0a0
+  - libglib >=2.78.1,<3.0a0
   - libiconv >=1.17,<2.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/gstreamer-1.22.6-hb4038d2_2.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/gstreamer-1.22.7-hb4038d2_0.conda
   hash:
-    md5: e6d2009457a1e5d9653fd06873a7a367
-    sha256: 08600f04d220a43f0ef5c383bb586cdd05ec482aceadb397fcd43a233b946144
-  build: hb4038d2_2
+    md5: 9b2f6622276ed34d20eb36e6a4ce2f50
+    sha256: 5cb018ed96727ca7a7f8e782f0e2603135541dc011c926e1837f4cf536fc2341
+  build: hb4038d2_0
   arch: x86_64
   subdir: win-64
-  build_number: 2
+  build_number: 0
   license: LGPL-2.0-or-later
-  license_family: LGPL
-  size: 1939400
-  timestamp: 1696222270363
+  size: 1932223
+  timestamp: 1699936472411
 - platform: linux-64
   name: harfbuzz
-  version: 8.2.1
+  version: 8.3.0
   category: main
   manager: conda
   dependencies:
-  - cairo >=1.16.0,<2.0a0
+  - cairo >=1.18.0,<2.0a0
   - freetype >=2.12.1,<3.0a0
   - graphite2
   - icu >=73.2,<74.0a0
   - libgcc-ng >=12
-  - libglib >=2.78.0,<3.0a0
+  - libglib >=2.78.1,<3.0a0
   - libstdcxx-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-8.2.1-h3d44ed6_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-8.3.0-h3d44ed6_0.conda
   hash:
-    md5: 98db5f8813f45e2b29766aff0e4a499c
-    sha256: 5ca6585e6a4348bcbe214d57f5d6f560d15d23a6650770a2909475848b214edb
+    md5: 5a6f6c00ef982a9bc83558d9ac8f64a0
+    sha256: 4b55aea03b18a4084b750eee531ad978d4a3690f63019132c26c6ad26bbe3aed
   build: h3d44ed6_0
   arch: x86_64
   subdir: linux-64
   build_number: 0
   license: MIT
-  license_family: MIT
-  size: 1526592
-  timestamp: 1695089914042
+  size: 1547473
+  timestamp: 1699925311766
 - platform: linux-64
   name: hdf4
   version: 4.2.15
@@ -10556,21 +10640,21 @@ package:
   timestamp: 1695397923441
 - platform: linux-64
   name: jsonschema
-  version: 4.17.3
+  version: 4.19.2
   category: main
   manager: conda
   dependencies:
-  - attrs >=17.4.0
-  - importlib-metadata
+  - attrs >=22.2.0
   - importlib_resources >=1.4.0
+  - jsonschema-specifications >=2023.03.6
   - pkgutil-resolve-name >=1.3.10
-  - pyrsistent !=0.17.0,!=0.17.1,!=0.17.2,>=0.14.0
-  - python >=3.7
-  - typing_extensions
-  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda
+  - python >=3.8
+  - referencing >=0.28.4
+  - rpds-py >=0.7.1
+  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.19.2-pyhd8ed1ab_0.conda
   hash:
-    md5: 723268a468177cd44568eb8f794e0d80
-    sha256: 4f68a23430d1afc5c9b41c46fbac0ade33c0bf57a293c646bfdd6dc65350eada
+    md5: 24d41c2f9cc199d0a180ecf7ef54739c
+    sha256: 07e5d395d83c4b12a7abe3989fb42abdcd3b1c51cd27549e5eab390bb8c7bf0f
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: linux-64
@@ -10578,25 +10662,25 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 70487
-  timestamp: 1669810556169
+  size: 71509
+  timestamp: 1698678642652
 - platform: osx-64
   name: jsonschema
-  version: 4.17.3
+  version: 4.19.2
   category: main
   manager: conda
   dependencies:
-  - attrs >=17.4.0
-  - importlib-metadata
+  - attrs >=22.2.0
   - importlib_resources >=1.4.0
+  - jsonschema-specifications >=2023.03.6
   - pkgutil-resolve-name >=1.3.10
-  - pyrsistent !=0.17.0,!=0.17.1,!=0.17.2,>=0.14.0
-  - python >=3.7
-  - typing_extensions
-  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda
+  - python >=3.8
+  - referencing >=0.28.4
+  - rpds-py >=0.7.1
+  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.19.2-pyhd8ed1ab_0.conda
   hash:
-    md5: 723268a468177cd44568eb8f794e0d80
-    sha256: 4f68a23430d1afc5c9b41c46fbac0ade33c0bf57a293c646bfdd6dc65350eada
+    md5: 24d41c2f9cc199d0a180ecf7ef54739c
+    sha256: 07e5d395d83c4b12a7abe3989fb42abdcd3b1c51cd27549e5eab390bb8c7bf0f
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: osx-64
@@ -10604,25 +10688,25 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 70487
-  timestamp: 1669810556169
+  size: 71509
+  timestamp: 1698678642652
 - platform: osx-arm64
   name: jsonschema
-  version: 4.17.3
+  version: 4.19.2
   category: main
   manager: conda
   dependencies:
-  - attrs >=17.4.0
-  - importlib-metadata
+  - attrs >=22.2.0
   - importlib_resources >=1.4.0
+  - jsonschema-specifications >=2023.03.6
   - pkgutil-resolve-name >=1.3.10
-  - pyrsistent !=0.17.0,!=0.17.1,!=0.17.2,>=0.14.0
-  - python >=3.7
-  - typing_extensions
-  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda
+  - python >=3.8
+  - referencing >=0.28.4
+  - rpds-py >=0.7.1
+  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.19.2-pyhd8ed1ab_0.conda
   hash:
-    md5: 723268a468177cd44568eb8f794e0d80
-    sha256: 4f68a23430d1afc5c9b41c46fbac0ade33c0bf57a293c646bfdd6dc65350eada
+    md5: 24d41c2f9cc199d0a180ecf7ef54739c
+    sha256: 07e5d395d83c4b12a7abe3989fb42abdcd3b1c51cd27549e5eab390bb8c7bf0f
   build: pyhd8ed1ab_0
   arch: aarch64
   subdir: osx-arm64
@@ -10630,25 +10714,25 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 70487
-  timestamp: 1669810556169
+  size: 71509
+  timestamp: 1698678642652
 - platform: win-64
   name: jsonschema
-  version: 4.17.3
+  version: 4.19.2
   category: main
   manager: conda
   dependencies:
-  - attrs >=17.4.0
-  - importlib-metadata
+  - attrs >=22.2.0
   - importlib_resources >=1.4.0
+  - jsonschema-specifications >=2023.03.6
   - pkgutil-resolve-name >=1.3.10
-  - pyrsistent !=0.17.0,!=0.17.1,!=0.17.2,>=0.14.0
-  - python >=3.7
-  - typing_extensions
-  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda
+  - python >=3.8
+  - referencing >=0.28.4
+  - rpds-py >=0.7.1
+  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.19.2-pyhd8ed1ab_0.conda
   hash:
-    md5: 723268a468177cd44568eb8f794e0d80
-    sha256: 4f68a23430d1afc5c9b41c46fbac0ade33c0bf57a293c646bfdd6dc65350eada
+    md5: 24d41c2f9cc199d0a180ecf7ef54739c
+    sha256: 07e5d395d83c4b12a7abe3989fb42abdcd3b1c51cd27549e5eab390bb8c7bf0f
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: win-64
@@ -10656,28 +10740,116 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 70487
-  timestamp: 1669810556169
+  size: 71509
+  timestamp: 1698678642652
 - platform: linux-64
-  name: jsonschema-with-format-nongpl
-  version: 4.17.3
+  name: jsonschema-specifications
+  version: 2023.7.1
   category: main
   manager: conda
   dependencies:
-  - fqdn
-  - idna
-  - isoduration
-  - jsonpointer >1.13
-  - jsonschema >=4.17.3,<4.17.4.0a0
-  - python
-  - rfc3339-validator
-  - rfc3986-validator >0.1.0
-  - uri-template
-  - webcolors >=1.11
-  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-with-format-nongpl-4.17.3-pyhd8ed1ab_0.conda
-  hash:
-    md5: 7a709748e93f0b2c33d6b5b676b6d9d0
-    sha256: 767da9c47d64e1dc826d3173e46ff6fd4e858c94ff61d67ff4f976c7bc9502a2
+  - importlib_resources >=1.4.0
+  - python >=3.8
+  - referencing >=0.25.0
+  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-specifications-2023.7.1-pyhd8ed1ab_0.conda
+  hash:
+    md5: 7c27ea1bdbe520bb830dcadd59f55cbf
+    sha256: 7b0061e106674f27cc718f79a095e90a5667a3635ec6626dd23b3be0fd2bfbdc
+  build: pyhd8ed1ab_0
+  arch: x86_64
+  subdir: linux-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 15296
+  timestamp: 1689701341221
+- platform: osx-64
+  name: jsonschema-specifications
+  version: 2023.7.1
+  category: main
+  manager: conda
+  dependencies:
+  - importlib_resources >=1.4.0
+  - python >=3.8
+  - referencing >=0.25.0
+  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-specifications-2023.7.1-pyhd8ed1ab_0.conda
+  hash:
+    md5: 7c27ea1bdbe520bb830dcadd59f55cbf
+    sha256: 7b0061e106674f27cc718f79a095e90a5667a3635ec6626dd23b3be0fd2bfbdc
+  build: pyhd8ed1ab_0
+  arch: x86_64
+  subdir: osx-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 15296
+  timestamp: 1689701341221
+- platform: osx-arm64
+  name: jsonschema-specifications
+  version: 2023.7.1
+  category: main
+  manager: conda
+  dependencies:
+  - importlib_resources >=1.4.0
+  - python >=3.8
+  - referencing >=0.25.0
+  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-specifications-2023.7.1-pyhd8ed1ab_0.conda
+  hash:
+    md5: 7c27ea1bdbe520bb830dcadd59f55cbf
+    sha256: 7b0061e106674f27cc718f79a095e90a5667a3635ec6626dd23b3be0fd2bfbdc
+  build: pyhd8ed1ab_0
+  arch: aarch64
+  subdir: osx-arm64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 15296
+  timestamp: 1689701341221
+- platform: win-64
+  name: jsonschema-specifications
+  version: 2023.7.1
+  category: main
+  manager: conda
+  dependencies:
+  - importlib_resources >=1.4.0
+  - python >=3.8
+  - referencing >=0.25.0
+  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-specifications-2023.7.1-pyhd8ed1ab_0.conda
+  hash:
+    md5: 7c27ea1bdbe520bb830dcadd59f55cbf
+    sha256: 7b0061e106674f27cc718f79a095e90a5667a3635ec6626dd23b3be0fd2bfbdc
+  build: pyhd8ed1ab_0
+  arch: x86_64
+  subdir: win-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 15296
+  timestamp: 1689701341221
+- platform: linux-64
+  name: jsonschema-with-format-nongpl
+  version: 4.19.2
+  category: main
+  manager: conda
+  dependencies:
+  - fqdn
+  - idna
+  - isoduration
+  - jsonpointer >1.13
+  - jsonschema >=4.19.2,<4.19.3.0a0
+  - python
+  - rfc3339-validator
+  - rfc3986-validator >0.1.0
+  - uri-template
+  - webcolors >=1.11
+  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-with-format-nongpl-4.19.2-pyhd8ed1ab_0.conda
+  hash:
+    md5: c447b7c28ad6bb3306f0015f1195c721
+    sha256: b06681b4499635f0ed901f4879122bfd3ff6ef28de1797367769a4ba6b990b0d
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: linux-64
@@ -10685,11 +10857,11 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 6612
-  timestamp: 1669810577413
+  size: 7389
+  timestamp: 1698678669876
 - platform: osx-64
   name: jsonschema-with-format-nongpl
-  version: 4.17.3
+  version: 4.19.2
   category: main
   manager: conda
   dependencies:
@@ -10697,16 +10869,16 @@ package:
   - idna
   - isoduration
   - jsonpointer >1.13
-  - jsonschema >=4.17.3,<4.17.4.0a0
+  - jsonschema >=4.19.2,<4.19.3.0a0
   - python
   - rfc3339-validator
   - rfc3986-validator >0.1.0
   - uri-template
   - webcolors >=1.11
-  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-with-format-nongpl-4.17.3-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-with-format-nongpl-4.19.2-pyhd8ed1ab_0.conda
   hash:
-    md5: 7a709748e93f0b2c33d6b5b676b6d9d0
-    sha256: 767da9c47d64e1dc826d3173e46ff6fd4e858c94ff61d67ff4f976c7bc9502a2
+    md5: c447b7c28ad6bb3306f0015f1195c721
+    sha256: b06681b4499635f0ed901f4879122bfd3ff6ef28de1797367769a4ba6b990b0d
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: osx-64
@@ -10714,11 +10886,11 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 6612
-  timestamp: 1669810577413
+  size: 7389
+  timestamp: 1698678669876
 - platform: osx-arm64
   name: jsonschema-with-format-nongpl
-  version: 4.17.3
+  version: 4.19.2
   category: main
   manager: conda
   dependencies:
@@ -10726,16 +10898,16 @@ package:
   - idna
   - isoduration
   - jsonpointer >1.13
-  - jsonschema >=4.17.3,<4.17.4.0a0
+  - jsonschema >=4.19.2,<4.19.3.0a0
   - python
   - rfc3339-validator
   - rfc3986-validator >0.1.0
   - uri-template
   - webcolors >=1.11
-  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-with-format-nongpl-4.17.3-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-with-format-nongpl-4.19.2-pyhd8ed1ab_0.conda
   hash:
-    md5: 7a709748e93f0b2c33d6b5b676b6d9d0
-    sha256: 767da9c47d64e1dc826d3173e46ff6fd4e858c94ff61d67ff4f976c7bc9502a2
+    md5: c447b7c28ad6bb3306f0015f1195c721
+    sha256: b06681b4499635f0ed901f4879122bfd3ff6ef28de1797367769a4ba6b990b0d
   build: pyhd8ed1ab_0
   arch: aarch64
   subdir: osx-arm64
@@ -10743,11 +10915,11 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 6612
-  timestamp: 1669810577413
+  size: 7389
+  timestamp: 1698678669876
 - platform: win-64
   name: jsonschema-with-format-nongpl
-  version: 4.17.3
+  version: 4.19.2
   category: main
   manager: conda
   dependencies:
@@ -10755,16 +10927,16 @@ package:
   - idna
   - isoduration
   - jsonpointer >1.13
-  - jsonschema >=4.17.3,<4.17.4.0a0
+  - jsonschema >=4.19.2,<4.19.3.0a0
   - python
   - rfc3339-validator
   - rfc3986-validator >0.1.0
   - uri-template
   - webcolors >=1.11
-  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-with-format-nongpl-4.17.3-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-with-format-nongpl-4.19.2-pyhd8ed1ab_0.conda
   hash:
-    md5: 7a709748e93f0b2c33d6b5b676b6d9d0
-    sha256: 767da9c47d64e1dc826d3173e46ff6fd4e858c94ff61d67ff4f976c7bc9502a2
+    md5: c447b7c28ad6bb3306f0015f1195c721
+    sha256: b06681b4499635f0ed901f4879122bfd3ff6ef28de1797367769a4ba6b990b0d
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: win-64
@@ -10772,8 +10944,8 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 6612
-  timestamp: 1669810577413
+  size: 7389
+  timestamp: 1698678669876
 - platform: linux-64
   name: jupyter-lsp
   version: 2.2.0
@@ -11058,108 +11230,112 @@ package:
   timestamp: 1698674327608
 - platform: linux-64
   name: jupyter_events
-  version: 0.6.3
+  version: 0.9.0
   category: main
   manager: conda
   dependencies:
-  - jsonschema-with-format-nongpl >=3.2
-  - python >=3.7
+  - jsonschema-with-format-nongpl >=4.18.0
+  - python >=3.8
   - python-json-logger >=2.0.4
   - pyyaml >=5.3
+  - referencing
   - rfc3339-validator
   - rfc3986-validator >=0.1.1
   - traitlets >=5.3
-  url: https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.6.3-pyhd8ed1ab_1.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.9.0-pyhd8ed1ab_0.conda
   hash:
-    md5: 2ac0d00a0fb3f1a4c81c460ba56bb23b
-    sha256: 457e05bfcd6a37fbb8b4a44a500be7512e23bf1ef507e46fbd07497c217a2787
-  build: pyhd8ed1ab_1
+    md5: 00ba25993f0dba38cf72a7224e33289f
+    sha256: 713f0cc927a862862a6d35bfb29c4114f987e4f59e2a8a14f71f23fcd7edfec3
+  build: pyhd8ed1ab_0
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 21261
-  timestamp: 1690301765018
+  size: 21354
+  timestamp: 1699286038042
 - platform: osx-64
   name: jupyter_events
-  version: 0.6.3
+  version: 0.9.0
   category: main
   manager: conda
   dependencies:
-  - jsonschema-with-format-nongpl >=3.2
-  - python >=3.7
+  - jsonschema-with-format-nongpl >=4.18.0
+  - python >=3.8
   - python-json-logger >=2.0.4
   - pyyaml >=5.3
+  - referencing
   - rfc3339-validator
   - rfc3986-validator >=0.1.1
   - traitlets >=5.3
-  url: https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.6.3-pyhd8ed1ab_1.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.9.0-pyhd8ed1ab_0.conda
   hash:
-    md5: 2ac0d00a0fb3f1a4c81c460ba56bb23b
-    sha256: 457e05bfcd6a37fbb8b4a44a500be7512e23bf1ef507e46fbd07497c217a2787
-  build: pyhd8ed1ab_1
+    md5: 00ba25993f0dba38cf72a7224e33289f
+    sha256: 713f0cc927a862862a6d35bfb29c4114f987e4f59e2a8a14f71f23fcd7edfec3
+  build: pyhd8ed1ab_0
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 21261
-  timestamp: 1690301765018
+  size: 21354
+  timestamp: 1699286038042
 - platform: osx-arm64
   name: jupyter_events
-  version: 0.6.3
+  version: 0.9.0
   category: main
   manager: conda
   dependencies:
-  - jsonschema-with-format-nongpl >=3.2
-  - python >=3.7
+  - jsonschema-with-format-nongpl >=4.18.0
+  - python >=3.8
   - python-json-logger >=2.0.4
   - pyyaml >=5.3
+  - referencing
   - rfc3339-validator
   - rfc3986-validator >=0.1.1
   - traitlets >=5.3
-  url: https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.6.3-pyhd8ed1ab_1.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.9.0-pyhd8ed1ab_0.conda
   hash:
-    md5: 2ac0d00a0fb3f1a4c81c460ba56bb23b
-    sha256: 457e05bfcd6a37fbb8b4a44a500be7512e23bf1ef507e46fbd07497c217a2787
-  build: pyhd8ed1ab_1
+    md5: 00ba25993f0dba38cf72a7224e33289f
+    sha256: 713f0cc927a862862a6d35bfb29c4114f987e4f59e2a8a14f71f23fcd7edfec3
+  build: pyhd8ed1ab_0
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 21261
-  timestamp: 1690301765018
+  size: 21354
+  timestamp: 1699286038042
 - platform: win-64
   name: jupyter_events
-  version: 0.6.3
+  version: 0.9.0
   category: main
   manager: conda
   dependencies:
-  - jsonschema-with-format-nongpl >=3.2
-  - python >=3.7
+  - jsonschema-with-format-nongpl >=4.18.0
+  - python >=3.8
   - python-json-logger >=2.0.4
   - pyyaml >=5.3
+  - referencing
   - rfc3339-validator
   - rfc3986-validator >=0.1.1
   - traitlets >=5.3
-  url: https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.6.3-pyhd8ed1ab_1.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.9.0-pyhd8ed1ab_0.conda
   hash:
-    md5: 2ac0d00a0fb3f1a4c81c460ba56bb23b
-    sha256: 457e05bfcd6a37fbb8b4a44a500be7512e23bf1ef507e46fbd07497c217a2787
-  build: pyhd8ed1ab_1
+    md5: 00ba25993f0dba38cf72a7224e33289f
+    sha256: 713f0cc927a862862a6d35bfb29c4114f987e4f59e2a8a14f71f23fcd7edfec3
+  build: pyhd8ed1ab_0
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 21261
-  timestamp: 1690301765018
+  size: 21354
+  timestamp: 1699286038042
 - platform: linux-64
   name: jupyter_server
   version: 2.10.0
@@ -11618,7 +11794,7 @@ package:
   timestamp: 1649936689608
 - platform: linux-64
   name: jupyterlab_server
-  version: 2.24.0
+  version: 2.25.1
   category: main
   manager: conda
   dependencies:
@@ -11626,27 +11802,29 @@ package:
   - importlib-metadata >=4.8.3
   - jinja2 >=3.0.3
   - json5 >=0.9.0
-  - jsonschema >=4.17.3
+  - jsonschema >=4.18
   - jupyter_server >=1.21,<3
   - packaging >=21.3
-  - python >=3.7
-  - requests >=2.28
-  url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab_server-2.24.0-pyhd8ed1ab_0.conda
+  - python >=3.8
+  - requests >=2.31
+  url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab_server-2.25.1-pyhd8ed1ab_0.conda
   hash:
-    md5: 327bfe1c99154f02259d29810bd70afc
-    sha256: 7084223bb168268ba93334fc27410885bdc6e537020d6a91ab0f46f37a3f3ded
+    md5: 5cf15f8fd42c77af4eb1611fe614df2f
+    sha256: 5f373d9adc11b6d49bee06a4c6bea9623fff1d2a0b798edc2e3f594680aa18f3
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: linux-64
   build_number: 0
+  constrains:
+  - openapi-core >=0.18.0,<0.19.0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 60108
-  timestamp: 1690206297277
+  size: 48817
+  timestamp: 1699455046539
 - platform: osx-64
   name: jupyterlab_server
-  version: 2.24.0
+  version: 2.25.1
   category: main
   manager: conda
   dependencies:
@@ -11654,27 +11832,29 @@ package:
   - importlib-metadata >=4.8.3
   - jinja2 >=3.0.3
   - json5 >=0.9.0
-  - jsonschema >=4.17.3
+  - jsonschema >=4.18
   - jupyter_server >=1.21,<3
   - packaging >=21.3
-  - python >=3.7
-  - requests >=2.28
-  url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab_server-2.24.0-pyhd8ed1ab_0.conda
+  - python >=3.8
+  - requests >=2.31
+  url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab_server-2.25.1-pyhd8ed1ab_0.conda
   hash:
-    md5: 327bfe1c99154f02259d29810bd70afc
-    sha256: 7084223bb168268ba93334fc27410885bdc6e537020d6a91ab0f46f37a3f3ded
+    md5: 5cf15f8fd42c77af4eb1611fe614df2f
+    sha256: 5f373d9adc11b6d49bee06a4c6bea9623fff1d2a0b798edc2e3f594680aa18f3
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: osx-64
   build_number: 0
+  constrains:
+  - openapi-core >=0.18.0,<0.19.0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 60108
-  timestamp: 1690206297277
+  size: 48817
+  timestamp: 1699455046539
 - platform: osx-arm64
   name: jupyterlab_server
-  version: 2.24.0
+  version: 2.25.1
   category: main
   manager: conda
   dependencies:
@@ -11682,27 +11862,29 @@ package:
   - importlib-metadata >=4.8.3
   - jinja2 >=3.0.3
   - json5 >=0.9.0
-  - jsonschema >=4.17.3
+  - jsonschema >=4.18
   - jupyter_server >=1.21,<3
   - packaging >=21.3
-  - python >=3.7
-  - requests >=2.28
-  url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab_server-2.24.0-pyhd8ed1ab_0.conda
+  - python >=3.8
+  - requests >=2.31
+  url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab_server-2.25.1-pyhd8ed1ab_0.conda
   hash:
-    md5: 327bfe1c99154f02259d29810bd70afc
-    sha256: 7084223bb168268ba93334fc27410885bdc6e537020d6a91ab0f46f37a3f3ded
+    md5: 5cf15f8fd42c77af4eb1611fe614df2f
+    sha256: 5f373d9adc11b6d49bee06a4c6bea9623fff1d2a0b798edc2e3f594680aa18f3
   build: pyhd8ed1ab_0
   arch: aarch64
   subdir: osx-arm64
   build_number: 0
+  constrains:
+  - openapi-core >=0.18.0,<0.19.0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 60108
-  timestamp: 1690206297277
+  size: 48817
+  timestamp: 1699455046539
 - platform: win-64
   name: jupyterlab_server
-  version: 2.24.0
+  version: 2.25.1
   category: main
   manager: conda
   dependencies:
@@ -11710,24 +11892,26 @@ package:
   - importlib-metadata >=4.8.3
   - jinja2 >=3.0.3
   - json5 >=0.9.0
-  - jsonschema >=4.17.3
+  - jsonschema >=4.18
   - jupyter_server >=1.21,<3
   - packaging >=21.3
-  - python >=3.7
-  - requests >=2.28
-  url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab_server-2.24.0-pyhd8ed1ab_0.conda
+  - python >=3.8
+  - requests >=2.31
+  url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab_server-2.25.1-pyhd8ed1ab_0.conda
   hash:
-    md5: 327bfe1c99154f02259d29810bd70afc
-    sha256: 7084223bb168268ba93334fc27410885bdc6e537020d6a91ab0f46f37a3f3ded
+    md5: 5cf15f8fd42c77af4eb1611fe614df2f
+    sha256: 5f373d9adc11b6d49bee06a4c6bea9623fff1d2a0b798edc2e3f594680aa18f3
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: win-64
   build_number: 0
+  constrains:
+  - openapi-core >=0.18.0,<0.19.0
   license: BSD-3-Clause
   license_family: BSD
   noarch: python
-  size: 60108
-  timestamp: 1690206297277
+  size: 48817
+  timestamp: 1699455046539
 - platform: linux-64
   name: kealib
   version: 1.5.2
@@ -11813,92 +11997,92 @@ package:
   timestamp: 1696011596185
 - platform: linux-64
   name: keyring
-  version: 24.2.0
+  version: 24.3.0
   category: main
   manager: conda
   dependencies:
   - jaraco.classes
   - jeepney >=0.4.2
-  - python >=3.12.0rc3,<3.13.0a0
+  - python >=3.12,<3.13.0a0
   - python_abi 3.12.* *_cp312
   - secretstorage >=3.2
-  url: https://conda.anaconda.org/conda-forge/linux-64/keyring-24.2.0-py312h7900ff3_1.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/keyring-24.3.0-py312h7900ff3_0.conda
   hash:
-    md5: 5901a81eb641bfba071eaaa02bcc2c3c
-    sha256: 295f97b1f85ed8c912452177f2fa0021197f9e193c8e221bdb1b90359c939fd5
-  build: py312h7900ff3_1
+    md5: c303e2ddfc697a70a137940f8a6b2e1d
+    sha256: 312656da4f0b4b0aacee5914735fdc781bc8412edee6cc90b937a279975d8b1e
+  build: py312h7900ff3_0
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 0
   license: MIT
   license_family: MIT
-  size: 75994
-  timestamp: 1696001657727
+  size: 76016
+  timestamp: 1699923914435
 - platform: osx-64
   name: keyring
-  version: 24.2.0
+  version: 24.3.0
   category: main
   manager: conda
   dependencies:
   - jaraco.classes
-  - python >=3.12.0rc3,<3.13.0a0
+  - python >=3.12,<3.13.0a0
   - python_abi 3.12.* *_cp312
-  url: https://conda.anaconda.org/conda-forge/osx-64/keyring-24.2.0-py312hb401068_1.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/keyring-24.3.0-py312hb401068_0.conda
   hash:
-    md5: 2fb87c768752d4b0d5260b70e41c63fa
-    sha256: 70a244ed8b733e6f0592948d9576642d50f6e77e998a2de40a4f5510457bbb1f
-  build: py312hb401068_1
+    md5: 5b28534ef3af5f98470c318f29cdc375
+    sha256: 82beac052bdfe0a199103012b8f8dc40f8e878f859ba9b762ce32cdb30877d15
+  build: py312hb401068_0
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 0
   license: MIT
   license_family: MIT
-  size: 76183
-  timestamp: 1696001887488
+  size: 76447
+  timestamp: 1699924137579
 - platform: osx-arm64
   name: keyring
-  version: 24.2.0
+  version: 24.3.0
   category: main
   manager: conda
   dependencies:
   - jaraco.classes
-  - python >=3.12.0rc3,<3.13.0a0
-  - python >=3.12.0rc3,<3.13.0a0 *_cpython
+  - python >=3.12,<3.13.0a0
+  - python >=3.12,<3.13.0a0 *_cpython
   - python_abi 3.12.* *_cp312
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/keyring-24.2.0-py312h81bd7bf_1.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/keyring-24.3.0-py312h81bd7bf_0.conda
   hash:
-    md5: 7c9bfe21f83c74479f383da1fea24353
-    sha256: ef2e26fb7194d7ffccb6ca5e98111ea09b7805cc6471b0a214dc19da8cdc5716
-  build: py312h81bd7bf_1
+    md5: 3a6735f11d9604cbafd0ab1c3e9ac77e
+    sha256: 6d7fd6cb2310674f0736ee6ddd5f752663df92db9e9e0bfd43fa4bb06c6a2b7b
+  build: py312h81bd7bf_0
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 0
   license: MIT
   license_family: MIT
-  size: 76248
-  timestamp: 1696001986857
+  size: 77030
+  timestamp: 1699924369964
 - platform: win-64
   name: keyring
-  version: 24.2.0
+  version: 24.3.0
   category: main
   manager: conda
   dependencies:
   - jaraco.classes
-  - python >=3.12.0rc3,<3.13.0a0
+  - python >=3.12,<3.13.0a0
   - python_abi 3.12.* *_cp312
   - pywin32-ctypes >=0.2.0
-  url: https://conda.anaconda.org/conda-forge/win-64/keyring-24.2.0-py312h2e8e312_1.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/keyring-24.3.0-py312h2e8e312_0.conda
   hash:
-    md5: 163792b60799da39316da9131714eaee
-    sha256: 633ee7ef0be1fe7880037d976cf58bc55179c72c1751c8ffe6923f074a5a77c7
-  build: py312h2e8e312_1
+    md5: b2ad5f984537e2705416e9de60e9bf52
+    sha256: 2d8d39105c1ad26c2f0b518bc0f35134879231acf9a8717094f50b5cc2d2255a
+  build: py312h2e8e312_0
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 0
   license: MIT
   license_family: MIT
-  size: 92566
-  timestamp: 1696000990525
+  size: 92690
+  timestamp: 1699924378187
 - platform: linux-64
   name: keyutils
   version: 1.6.1
@@ -12583,7 +12767,7 @@ package:
   category: main
   manager: conda
   dependencies:
-  - aws-crt-cpp >=0.24.5,<0.24.6.0a0
+  - aws-crt-cpp >=0.24.6,<0.24.7.0a0
   - aws-sdk-cpp >=1.11.182,<1.11.183.0a0
   - bzip2 >=1.0.8,<2.0a0
   - glog >=0.6.0,<0.7.0a0
@@ -12602,21 +12786,21 @@ package:
   - re2
   - snappy >=1.1.10,<2.0a0
   - zstd >=1.5.5,<1.6.0a0
-  url: https://conda.anaconda.org/conda-forge/linux-64/libarrow-14.0.1-h0406937_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libarrow-14.0.1-he5826ec_2_cpu.conda
   hash:
-    md5: 6cd542d836507e0c9bec0c0d6112b024
-    sha256: 461384bb5fba971abc5d43a986222d73ae72e15034e7b403e0ba94c5712db887
-  build: h0406937_1_cpu
+    md5: de46063f85dda71f4d63f7eabf817d38
+    sha256: 05678a4cd3417ff0c3cfeaf298fbb572cf62a8df8183ae9d8016cf26f8bb5ad9
+  build: he5826ec_2_cpu
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 2
   constrains:
   - apache-arrow-proc =*=cpu
   - parquet-cpp <0.0a0
   - arrow-cpp <0.0a0
   license: Apache-2.0
-  size: 22755382
-  timestamp: 1699523401334
+  size: 22733439
+  timestamp: 1699952996350
 - platform: osx-64
   name: libarrow
   version: 14.0.1
@@ -12625,7 +12809,7 @@ package:
   dependencies:
   - __osx >=10.13
   - __osx >=10.9
-  - aws-crt-cpp >=0.24.5,<0.24.6.0a0
+  - aws-crt-cpp >=0.24.6,<0.24.7.0a0
   - aws-sdk-cpp >=1.11.182,<1.11.183.0a0
   - bzip2 >=1.0.8,<2.0a0
   - glog >=0.6.0,<0.7.0a0
@@ -12643,21 +12827,21 @@ package:
   - re2
   - snappy >=1.1.10,<2.0a0
   - zstd >=1.5.5,<1.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/libarrow-14.0.1-hcf474e5_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/libarrow-14.0.1-h3b78187_2_cpu.conda
   hash:
-    md5: 6758ff6dd9702d433fae4f19d93fe30e
-    sha256: 1f3e17a1b8a32a31eb95c8300a899c6946a7677bf1351b072a270bfd2c0ceb21
-  build: hcf474e5_1_cpu
+    md5: 4019faa1f37173f65a63ab72f6de7b9b
+    sha256: 7f3d3522779cfe412ad06609a98a9aa49e7f08826486abc5f48427e92c4dd5c2
+  build: h3b78187_2_cpu
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 2
   constrains:
-  - parquet-cpp <0.0a0
-  - apache-arrow-proc =*=cpu
   - arrow-cpp <0.0a0
+  - apache-arrow-proc =*=cpu
+  - parquet-cpp <0.0a0
   license: Apache-2.0
-  size: 15794001
-  timestamp: 1699524184970
+  size: 15793644
+  timestamp: 1699954449716
 - platform: osx-arm64
   name: libarrow
   version: 14.0.1
@@ -12665,7 +12849,7 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - aws-crt-cpp >=0.24.5,<0.24.6.0a0
+  - aws-crt-cpp >=0.24.6,<0.24.7.0a0
   - aws-sdk-cpp >=1.11.182,<1.11.183.0a0
   - bzip2 >=1.0.8,<2.0a0
   - glog >=0.6.0,<0.7.0a0
@@ -12683,28 +12867,28 @@ package:
   - re2
   - snappy >=1.1.10,<2.0a0
   - zstd >=1.5.5,<1.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-14.0.1-h7bb5718_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-14.0.1-ha4caa07_2_cpu.conda
   hash:
-    md5: 11122c7985ba7511d63df5f2cad917fa
-    sha256: b07036659cb3492f753c93fdd0da6b8ae177e1ec55cb1208b5d02d63bf80723d
-  build: h7bb5718_1_cpu
+    md5: 61cad580ddef421f34e9bace97333c76
+    sha256: e1821f374860561f52d096bed640edc813182f406a6c69b41fdd1927587c4410
+  build: ha4caa07_2_cpu
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 2
   constrains:
-  - parquet-cpp <0.0a0
   - arrow-cpp <0.0a0
   - apache-arrow-proc =*=cpu
+  - parquet-cpp <0.0a0
   license: Apache-2.0
-  size: 14648493
-  timestamp: 1699524346022
+  size: 14653418
+  timestamp: 1699954025717
 - platform: win-64
   name: libarrow
   version: 14.0.1
   category: main
   manager: conda
   dependencies:
-  - aws-crt-cpp >=0.24.5,<0.24.6.0a0
+  - aws-crt-cpp >=0.24.6,<0.24.7.0a0
   - aws-sdk-cpp >=1.11.182,<1.11.183.0a0
   - bzip2 >=1.0.8,<2.0a0
   - libabseil * cxx17*
@@ -12726,41 +12910,41 @@ package:
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
   - zstd >=1.5.5,<1.6.0a0
-  url: https://conda.anaconda.org/conda-forge/win-64/libarrow-14.0.1-h85f1704_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/libarrow-14.0.1-h0850d3a_2_cpu.conda
   hash:
-    md5: 95b0d01f541c47a64c93cb463fadb0e3
-    sha256: cda792996942212f4767686243407ea85cbffbe6d68b4e84711fb4cb18fe1c2e
-  build: h85f1704_1_cpu
+    md5: 2db754974c74e3071ad2511ea917e370
+    sha256: 0dbe8347a052c0a2fb69ae59e3aa3dc22873bafdc1d6b18a3018a2b038c7f0ab
+  build: h0850d3a_2_cpu
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 2
   constrains:
   - apache-arrow-proc =*=cpu
-  - arrow-cpp <0.0a0
   - parquet-cpp <0.0a0
+  - arrow-cpp <0.0a0
   license: Apache-2.0
-  size: 5006246
-  timestamp: 1699523933221
+  size: 4948158
+  timestamp: 1699954330616
 - platform: linux-64
   name: libarrow-acero
   version: 14.0.1
   category: main
   manager: conda
   dependencies:
-  - libarrow 14.0.1 h0406937_1_cpu
+  - libarrow 14.0.1 he5826ec_2_cpu
   - libgcc-ng >=12
   - libstdcxx-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/libarrow-acero-14.0.1-h59595ed_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libarrow-acero-14.0.1-h59595ed_2_cpu.conda
   hash:
-    md5: dc5eb5026d43d5a9cebd03b335f190c8
-    sha256: 9d8e19f90f463ca85254d8e16181d65fa1c01b7a4833cbb72ed911a509dd9f12
-  build: h59595ed_1_cpu
+    md5: e59c90dcc94a1662d951bdd9ed489e91
+    sha256: 789c909cadb76d2936c946acf116d508a8132babe6aaeb6326f73ec9dac8e023
+  build: h59595ed_2_cpu
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 578932
-  timestamp: 1699523484485
+  size: 579112
+  timestamp: 1699953070354
 - platform: osx-64
   name: libarrow-acero
   version: 14.0.1
@@ -12768,19 +12952,19 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - libarrow 14.0.1 hcf474e5_1_cpu
+  - libarrow 14.0.1 h3b78187_2_cpu
   - libcxx >=15.0.7
-  url: https://conda.anaconda.org/conda-forge/osx-64/libarrow-acero-14.0.1-hc222712_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/libarrow-acero-14.0.1-hc222712_2_cpu.conda
   hash:
-    md5: 83f09cbc08a7a741032aca28067aabfa
-    sha256: 2b47502dcefbdd645b130369515551a77ee317f133b1a0ccbb157dfdb11155d6
-  build: hc222712_1_cpu
+    md5: 7842ca98457c1ffa601dc7e9fd2e92ef
+    sha256: 27cbb0b3a1d6757c20d7d7f9e33dcfb6f119981a1d3fbfef5f55b52da22c2955
+  build: hc222712_2_cpu
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 512556
-  timestamp: 1699524309594
+  size: 513270
+  timestamp: 1699954589612
 - platform: osx-arm64
   name: libarrow-acero
   version: 14.0.1
@@ -12788,62 +12972,62 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - libarrow 14.0.1 h7bb5718_1_cpu
+  - libarrow 14.0.1 ha4caa07_2_cpu
   - libcxx >=15.0.7
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-acero-14.0.1-had9dd58_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-acero-14.0.1-had9dd58_2_cpu.conda
   hash:
-    md5: dab478b07c494888aa403fb439a5dada
-    sha256: c1be980876224a1de110688ae1288de10cce5a982c110341e982e6e1654ff596
-  build: had9dd58_1_cpu
+    md5: be4b7c7babb11221103af17991d384ee
+    sha256: e732caa5149d472a145fb91fae880d26fd4ad896a1bfb5ae74cafef408cb8152
+  build: had9dd58_2_cpu
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 496611
-  timestamp: 1699524481824
+  size: 496475
+  timestamp: 1699954162741
 - platform: win-64
   name: libarrow-acero
   version: 14.0.1
   category: main
   manager: conda
   dependencies:
-  - libarrow 14.0.1 h85f1704_1_cpu
+  - libarrow 14.0.1 h0850d3a_2_cpu
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/libarrow-acero-14.0.1-h63175ca_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/libarrow-acero-14.0.1-h63175ca_2_cpu.conda
   hash:
-    md5: 4759a17dda5d98bb3aa8068bc13679df
-    sha256: e6b47b8796d1ec3b1ddc00e70a2930af89ea188a5232f0df3909aa97df629e52
-  build: h63175ca_1_cpu
+    md5: 73d5ddf703fd5385ae717ac64f9c91e6
+    sha256: b78218644a78363924fe5a0390f6ef8cf9bec5d88c5d65fde9926688497b9030
+  build: h63175ca_2_cpu
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 431380
-  timestamp: 1699524017095
+  size: 431441
+  timestamp: 1699954446795
 - platform: linux-64
   name: libarrow-dataset
   version: 14.0.1
   category: main
   manager: conda
   dependencies:
-  - libarrow 14.0.1 h0406937_1_cpu
-  - libarrow-acero 14.0.1 h59595ed_1_cpu
+  - libarrow 14.0.1 he5826ec_2_cpu
+  - libarrow-acero 14.0.1 h59595ed_2_cpu
   - libgcc-ng >=12
-  - libparquet 14.0.1 h352af49_1_cpu
+  - libparquet 14.0.1 h352af49_2_cpu
   - libstdcxx-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/libarrow-dataset-14.0.1-h59595ed_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libarrow-dataset-14.0.1-h59595ed_2_cpu.conda
   hash:
-    md5: b7948e05ad29fb89dfe18f23f445bc86
-    sha256: 9b246befad12c156dd10b7e91d32a4515abee2fc8c5e2b408d6bc1c2ea73edb0
-  build: h59595ed_1_cpu
+    md5: c2b9d36bb74f3c241c1437a1b7f8a97b
+    sha256: 0cfaf0553474379df317fbb117dd8176d560c4fe8b27d4bc5c5b95395f6e535d
+  build: h59595ed_2_cpu
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 583067
-  timestamp: 1699523609562
+  size: 581207
+  timestamp: 1699953172985
 - platform: osx-64
   name: libarrow-dataset
   version: 14.0.1
@@ -12851,21 +13035,21 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - libarrow 14.0.1 hcf474e5_1_cpu
-  - libarrow-acero 14.0.1 hc222712_1_cpu
+  - libarrow 14.0.1 h3b78187_2_cpu
+  - libarrow-acero 14.0.1 hc222712_2_cpu
   - libcxx >=15.0.7
-  - libparquet 14.0.1 h27bd29f_1_cpu
-  url: https://conda.anaconda.org/conda-forge/osx-64/libarrow-dataset-14.0.1-hc222712_1_cpu.conda
+  - libparquet 14.0.1 h27bd29f_2_cpu
+  url: https://conda.anaconda.org/conda-forge/osx-64/libarrow-dataset-14.0.1-hc222712_2_cpu.conda
   hash:
-    md5: 0d9e315f65d1c5c7cc63a9432203d594
-    sha256: 039e4f1b794bbde296d3d774ace3e82276d1b8255bafe8e52657d2bee69d0792
-  build: hc222712_1_cpu
+    md5: da79e5862e4264f7df2fe5d3643b0c89
+    sha256: 7ce93a7d13401379a0c8ef22fcff128005f2ccfce5196db665c373eae5adeca1
+  build: hc222712_2_cpu
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 514111
-  timestamp: 1699524548663
+  size: 513597
+  timestamp: 1699954847260
 - platform: osx-arm64
   name: libarrow-dataset
   version: 14.0.1
@@ -12873,44 +13057,44 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - libarrow 14.0.1 h7bb5718_1_cpu
-  - libarrow-acero 14.0.1 had9dd58_1_cpu
+  - libarrow 14.0.1 ha4caa07_2_cpu
+  - libarrow-acero 14.0.1 had9dd58_2_cpu
   - libcxx >=15.0.7
-  - libparquet 14.0.1 heaab74a_1_cpu
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-dataset-14.0.1-had9dd58_1_cpu.conda
+  - libparquet 14.0.1 heaab74a_2_cpu
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-dataset-14.0.1-had9dd58_2_cpu.conda
   hash:
-    md5: 710b15572b65ca7f7fae5e53ea10576a
-    sha256: 90230a77d8c7752ede5a3742d7e58af4da490dd0adfd6d1108b1d2b8e7f51147
-  build: had9dd58_1_cpu
+    md5: e8f58acc13e388e71be3e6b298703361
+    sha256: a1fa2fa37fadff49d56df93d2654933d3edca0b2f1e59c9a93009fa9aaf40fcb
+  build: had9dd58_2_cpu
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 528859
-  timestamp: 1699524826768
+  size: 528772
+  timestamp: 1699954499593
 - platform: win-64
   name: libarrow-dataset
   version: 14.0.1
   category: main
   manager: conda
   dependencies:
-  - libarrow 14.0.1 h85f1704_1_cpu
-  - libarrow-acero 14.0.1 h63175ca_1_cpu
-  - libparquet 14.0.1 h7ec3a38_1_cpu
+  - libarrow 14.0.1 h0850d3a_2_cpu
+  - libarrow-acero 14.0.1 h63175ca_2_cpu
+  - libparquet 14.0.1 h7ec3a38_2_cpu
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/libarrow-dataset-14.0.1-h63175ca_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/libarrow-dataset-14.0.1-h63175ca_2_cpu.conda
   hash:
-    md5: 450f52e659888a270c3310274f5339a2
-    sha256: df192d1bc9bf3b8fa7253aa74b4e6f3b1e1f323e5a950e884fbe2b3bd381d697
-  build: h63175ca_1_cpu
+    md5: de161cf6369efb4a830942942e8d2007
+    sha256: b4dd8e4ee9c89c4361bb865e0ff3978b833ea2d3956c6fdd84676fef01d6840e
+  build: h63175ca_2_cpu
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 429847
-  timestamp: 1699524264104
+  size: 429473
+  timestamp: 1699954752528
 - platform: linux-64
   name: libarrow-flight
   version: 14.0.1
@@ -12919,23 +13103,23 @@ package:
   dependencies:
   - libabseil * cxx17*
   - libabseil >=20230802.1,<20230803.0a0
-  - libarrow 14.0.1 h0406937_1_cpu
+  - libarrow 14.0.1 he5826ec_2_cpu
   - libgcc-ng >=12
   - libgrpc >=1.59.2,<1.60.0a0
   - libprotobuf >=4.24.4,<4.24.5.0a0
   - libstdcxx-ng >=12
   - ucx >=1.15.0,<1.16.0a0
-  url: https://conda.anaconda.org/conda-forge/linux-64/libarrow-flight-14.0.1-h120cb0d_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libarrow-flight-14.0.1-h120cb0d_2_cpu.conda
   hash:
-    md5: cf189c716cd96362c7c91d6d9fda6b0b
-    sha256: 7df11fe1fc0a6b8ca633c718fec92aa28a2bbe07f74d114b1bd2cd267439311c
-  build: h120cb0d_1_cpu
+    md5: 4b0ac222c6c8f25f2f4d0f9921c4eddb
+    sha256: 30f36492a0c1bcbfbe9b33ac418ca261e45d80d182147e665a91ebb6f5b82c88
+  build: h120cb0d_2_cpu
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 501349
-  timestamp: 1699523516343
+  size: 506497
+  timestamp: 1699953095530
 - platform: osx-64
   name: libarrow-flight
   version: 14.0.1
@@ -12946,21 +13130,21 @@ package:
   - __osx >=10.9
   - libabseil * cxx17*
   - libabseil >=20230802.1,<20230803.0a0
-  - libarrow 14.0.1 hcf474e5_1_cpu
+  - libarrow 14.0.1 h3b78187_2_cpu
   - libcxx >=15.0.7
   - libgrpc >=1.59.2,<1.60.0a0
   - libprotobuf >=4.24.4,<4.24.5.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/libarrow-flight-14.0.1-ha1803ca_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/libarrow-flight-14.0.1-h440f1c2_2_cpu.conda
   hash:
-    md5: ccd6cd093e56dbc1944e92f432fdb01d
-    sha256: 77cc93641b8e5bd0111f9d6c842ff88e59593130d1e6c7089b36d6def35bf24f
-  build: ha1803ca_1_cpu
+    md5: 8094cb0672ae6dff49fe1fb8e418e24d
+    sha256: fd2929c68da7c8dbad7416cb1352b3b486a586c4d0ebd498ae02d1894fc2513e
+  build: h440f1c2_2_cpu
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 321239
-  timestamp: 1699524367520
+  size: 321418
+  timestamp: 1699954649525
 - platform: osx-arm64
   name: libarrow-flight
   version: 14.0.1
@@ -12970,21 +13154,21 @@ package:
   - __osx >=10.9
   - libabseil * cxx17*
   - libabseil >=20230802.1,<20230803.0a0
-  - libarrow 14.0.1 h7bb5718_1_cpu
+  - libarrow 14.0.1 ha4caa07_2_cpu
   - libcxx >=15.0.7
   - libgrpc >=1.59.2,<1.60.0a0
   - libprotobuf >=4.24.4,<4.24.5.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-flight-14.0.1-h1011bfc_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-flight-14.0.1-h1011bfc_2_cpu.conda
   hash:
-    md5: 795d8f2bb1049ab37dab1e2656df6a23
-    sha256: fff9bd3f6c91f44aaa84cd4319c3ef1dd730e08108416fac7be8f70601fe176c
-  build: h1011bfc_1_cpu
+    md5: 06a7b8b47c0f8e7d456ee00b43dc0859
+    sha256: d0b274b8f845ec8f98a51ea560f702342b7a04a1e06281aeec8bc0b5fcc93465
+  build: h1011bfc_2_cpu
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 333408
-  timestamp: 1699524576779
+  size: 334005
+  timestamp: 1699954251497
 - platform: win-64
   name: libarrow-flight
   version: 14.0.1
@@ -12993,45 +13177,45 @@ package:
   dependencies:
   - libabseil * cxx17*
   - libabseil >=20230802.1,<20230803.0a0
-  - libarrow 14.0.1 h85f1704_1_cpu
+  - libarrow 14.0.1 h0850d3a_2_cpu
   - libgrpc >=1.59.2,<1.60.0a0
   - libprotobuf >=4.24.4,<4.24.5.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/libarrow-flight-14.0.1-h53b1db0_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/libarrow-flight-14.0.1-h53b1db0_2_cpu.conda
   hash:
-    md5: 684f4c0fd6e02276c4b59f446ac29cd9
-    sha256: b8063a4965a612eaf8f5805a81f04c8e8c5a4b1eebd0a0644321673901934aa1
-  build: h53b1db0_1_cpu
+    md5: 40fd731f9354f504fa5055e15b39fdbf
+    sha256: 23dab94ea8304272967f825732986c7cf3dcca76297a36b04b262b7d8bafa86a
+  build: h53b1db0_2_cpu
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 287174
-  timestamp: 1699524078657
+  size: 286549
+  timestamp: 1699954522564
 - platform: linux-64
   name: libarrow-flight-sql
   version: 14.0.1
   category: main
   manager: conda
   dependencies:
-  - libarrow 14.0.1 h0406937_1_cpu
-  - libarrow-flight 14.0.1 h120cb0d_1_cpu
+  - libarrow 14.0.1 he5826ec_2_cpu
+  - libarrow-flight 14.0.1 h120cb0d_2_cpu
   - libgcc-ng >=12
   - libprotobuf >=4.24.4,<4.24.5.0a0
   - libstdcxx-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/libarrow-flight-sql-14.0.1-h61ff412_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libarrow-flight-sql-14.0.1-h61ff412_2_cpu.conda
   hash:
-    md5: fa7db8ca53a9eb0ca62893209d4a52d6
-    sha256: b34f3e189572c8009b22e3920229eb8cf6e37897d632e2729a966236b5bc9746
-  build: h61ff412_1_cpu
+    md5: 7315191986ea5c5f452f367848654937
+    sha256: 6f15d91ef2c408f272aab9188c27ae9843f40ef8c44bcfdafc7deaaa70710bc1
+  build: h61ff412_2_cpu
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 194775
-  timestamp: 1699523638979
+  size: 195483
+  timestamp: 1699953198622
 - platform: osx-64
   name: libarrow-flight-sql
   version: 14.0.1
@@ -13040,21 +13224,21 @@ package:
   dependencies:
   - __osx >=10.13
   - __osx >=10.9
-  - libarrow 14.0.1 hcf474e5_1_cpu
-  - libarrow-flight 14.0.1 ha1803ca_1_cpu
+  - libarrow 14.0.1 h3b78187_2_cpu
+  - libarrow-flight 14.0.1 h440f1c2_2_cpu
   - libcxx >=15.0.7
   - libprotobuf >=4.24.4,<4.24.5.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/libarrow-flight-sql-14.0.1-h8ec153b_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/libarrow-flight-sql-14.0.1-h2cc6c1c_2_cpu.conda
   hash:
-    md5: d2a114707a9c584a92aa509227850804
-    sha256: 6bf424addfea70b21d2386a8d0dd0e9ace56c47b7bbdcd9b2c7fe1ccb594aad9
-  build: h8ec153b_1_cpu
+    md5: 0d0ef77169ffb6d0bdb505dcaaa2e29e
+    sha256: 7a2860ee6e3327a12f85c3a2837e2546767c086fd43c869ec8987cd1d96149ce
+  build: h2cc6c1c_2_cpu
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 155535
-  timestamp: 1699524605260
+  size: 156046
+  timestamp: 1699954914290
 - platform: osx-arm64
   name: libarrow-flight-sql
   version: 14.0.1
@@ -13062,51 +13246,51 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - libarrow 14.0.1 h7bb5718_1_cpu
-  - libarrow-flight 14.0.1 h1011bfc_1_cpu
+  - libarrow 14.0.1 ha4caa07_2_cpu
+  - libarrow-flight 14.0.1 h1011bfc_2_cpu
   - libcxx >=15.0.7
   - libprotobuf >=4.24.4,<4.24.5.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-flight-sql-14.0.1-h660fe36_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-flight-sql-14.0.1-h660fe36_2_cpu.conda
   hash:
-    md5: 369f206a2b446232c90963a9545d3cbc
-    sha256: 03a96a17e0202be09864c15b4e9729c27ca15b192ad021bbdf4c5b1355fea51a
-  build: h660fe36_1_cpu
+    md5: 636178a9d5ba0954ef8883720be924a9
+    sha256: 96897ff47ab865433c377835a7939af2ceb0c2777999c0f1805d60d34d67f6a6
+  build: h660fe36_2_cpu
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 163720
-  timestamp: 1699524909612
+  size: 163912
+  timestamp: 1699954584002
 - platform: win-64
   name: libarrow-flight-sql
   version: 14.0.1
   category: main
   manager: conda
   dependencies:
-  - libarrow 14.0.1 h85f1704_1_cpu
-  - libarrow-flight 14.0.1 h53b1db0_1_cpu
+  - libarrow 14.0.1 h0850d3a_2_cpu
+  - libarrow-flight 14.0.1 h53b1db0_2_cpu
   - libprotobuf >=4.24.4,<4.24.5.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/libarrow-flight-sql-14.0.1-h78eab7c_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/libarrow-flight-sql-14.0.1-h78eab7c_2_cpu.conda
   hash:
-    md5: 59e97adbfb14ae97eefa91b74aa2452b
-    sha256: 8a784ee46a1343873495da5a96fc6598723162b909cac5014eb409510ac9c737
-  build: h78eab7c_1_cpu
+    md5: 301ddce90de46951f2a8ffaa8f2c809c
+    sha256: f980adc2de3c2374b45f5b679fca9955ae3ed75097e341a5ac9a70387201dff0
+  build: h78eab7c_2_cpu
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 223652
-  timestamp: 1699524315392
+  size: 223141
+  timestamp: 1699954814311
 - platform: linux-64
   name: libarrow-gandiva
   version: 14.0.1
   category: main
   manager: conda
   dependencies:
-  - libarrow 14.0.1 h0406937_1_cpu
+  - libarrow 14.0.1 he5826ec_2_cpu
   - libgcc-ng >=12
   - libllvm15 >=15.0.7,<15.1.0a0
   - libre2-11 >=2023.6.2,<2024.0a0
@@ -13114,17 +13298,17 @@ package:
   - libutf8proc >=2.8.0,<3.0a0
   - openssl >=3.1.4,<4.0a0
   - re2
-  url: https://conda.anaconda.org/conda-forge/linux-64/libarrow-gandiva-14.0.1-hacb8726_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libarrow-gandiva-14.0.1-hacb8726_2_cpu.conda
   hash:
-    md5: 05d9955c98398a0978eca62e526fc0ee
-    sha256: 984435cf158cecf05ee9dcbaf47e0825aa4a7ae32809c7d6bf0d1d1654f2236f
-  build: hacb8726_1_cpu
+    md5: a7501248d25b3afded9602b86669be62
+    sha256: da3f84d7b67571b39e5f98c2ad4708b7fbc0831502210ebb05613f5e3dffcf3a
+  build: hacb8726_2_cpu
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 896426
-  timestamp: 1699523547937
+  size: 896215
+  timestamp: 1699953123227
 - platform: osx-64
   name: libarrow-gandiva
   version: 14.0.1
@@ -13132,24 +13316,24 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - libarrow 14.0.1 hcf474e5_1_cpu
+  - libarrow 14.0.1 h3b78187_2_cpu
   - libcxx >=15.0.7
   - libllvm15 >=15.0.7,<15.1.0a0
   - libre2-11 >=2023.6.2,<2024.0a0
   - libutf8proc >=2.8.0,<3.0a0
   - openssl >=3.1.4,<4.0a0
   - re2
-  url: https://conda.anaconda.org/conda-forge/osx-64/libarrow-gandiva-14.0.1-heeebe7c_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/libarrow-gandiva-14.0.1-heeebe7c_2_cpu.conda
   hash:
-    md5: 2db588f0db2fe7c36bd1c065b52b5081
-    sha256: e2eb050c553dc9be5917e35c0f661908fbf142e156cc80bc2fa792f85db7559f
-  build: heeebe7c_1_cpu
+    md5: 6755738a16ce967f8c9567890a273200
+    sha256: ca1b565c6c15137a7f6d149a50652616f7bd3938816f7f39f3546a15d55c2a2b
+  build: heeebe7c_2_cpu
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 700841
-  timestamp: 1699524428676
+  size: 700387
+  timestamp: 1699954720330
 - platform: osx-arm64
   name: libarrow-gandiva
   version: 14.0.1
@@ -13157,31 +13341,31 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - libarrow 14.0.1 h7bb5718_1_cpu
+  - libarrow 14.0.1 ha4caa07_2_cpu
   - libcxx >=15.0.7
   - libllvm15 >=15.0.7,<15.1.0a0
   - libre2-11 >=2023.6.2,<2024.0a0
   - libutf8proc >=2.8.0,<3.0a0
   - openssl >=3.1.4,<4.0a0
   - re2
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-gandiva-14.0.1-h2b96968_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-gandiva-14.0.1-h2b96968_2_cpu.conda
   hash:
-    md5: 7b44f16df2e1955867a7930a9bda72c5
-    sha256: f73bd5e13ff048cdc8ad5506a3fa3e8f079bb5276db080edb225c1de74abb094
-  build: h2b96968_1_cpu
+    md5: 3531c5fa3be17c18d8d2d4f692d43bba
+    sha256: 67a6d8971980a939ba39b28c1d138d019e4db82417b4abfce7922be271049c7d
+  build: h2b96968_2_cpu
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 690114
-  timestamp: 1699524663585
+  size: 690053
+  timestamp: 1699954337479
 - platform: win-64
   name: libarrow-gandiva
   version: 14.0.1
   category: main
   manager: conda
   dependencies:
-  - libarrow 14.0.1 h85f1704_1_cpu
+  - libarrow 14.0.1 h0850d3a_2_cpu
   - libre2-11 >=2023.6.2,<2024.0a0
   - libutf8proc >=2.8.0,<3.0a0
   - libzlib >=1.2.13,<1.3.0a0
@@ -13190,40 +13374,40 @@ package:
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/libarrow-gandiva-14.0.1-hb2eaab1_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/libarrow-gandiva-14.0.1-hb2eaab1_2_cpu.conda
   hash:
-    md5: 566abbb24feff0c809560af5e7ee412e
-    sha256: d5a014e3af3b7480ee0140458ef6de4c96d437ea8937fbf82a3d6046692343d8
-  build: hb2eaab1_1_cpu
+    md5: a6a4c7271e47ae65b83f06449d00e4f8
+    sha256: aecf4a66a884820efac310f5d942dd56a16e84727dc1d37001022d4ecbc18eb6
+  build: hb2eaab1_2_cpu
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 10175063
-  timestamp: 1699524142840
+  size: 10174483
+  timestamp: 1699954593436
 - platform: linux-64
   name: libarrow-substrait
   version: 14.0.1
   category: main
   manager: conda
   dependencies:
-  - libarrow 14.0.1 h0406937_1_cpu
-  - libarrow-acero 14.0.1 h59595ed_1_cpu
-  - libarrow-dataset 14.0.1 h59595ed_1_cpu
+  - libarrow 14.0.1 he5826ec_2_cpu
+  - libarrow-acero 14.0.1 h59595ed_2_cpu
+  - libarrow-dataset 14.0.1 h59595ed_2_cpu
   - libgcc-ng >=12
   - libprotobuf >=4.24.4,<4.24.5.0a0
   - libstdcxx-ng >=12
-  url: https://conda.anaconda.org/conda-forge/linux-64/libarrow-substrait-14.0.1-h61ff412_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libarrow-substrait-14.0.1-h61ff412_2_cpu.conda
   hash:
-    md5: 279bf5749bd65e468b2b564d29ca95c0
-    sha256: 427889bb5091aaba58b3cd5d5ffbcc5936811af3084fa8a16bc885ecfee137d0
-  build: h61ff412_1_cpu
+    md5: 4a660acddf1dde96a4e1afd721d6c676
+    sha256: daf940a8eabd896137d7f049afd3b84bdd8874b19d7aaf7f16fdb71a71c31413
+  build: h61ff412_2_cpu
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 510608
-  timestamp: 1699523667240
+  size: 509432
+  timestamp: 1699953222076
 - platform: osx-64
   name: libarrow-substrait
   version: 14.0.1
@@ -13232,22 +13416,22 @@ package:
   dependencies:
   - __osx >=10.13
   - __osx >=10.9
-  - libarrow 14.0.1 hcf474e5_1_cpu
-  - libarrow-acero 14.0.1 hc222712_1_cpu
-  - libarrow-dataset 14.0.1 hc222712_1_cpu
+  - libarrow 14.0.1 h3b78187_2_cpu
+  - libarrow-acero 14.0.1 hc222712_2_cpu
+  - libarrow-dataset 14.0.1 hc222712_2_cpu
   - libcxx >=15.0.7
   - libprotobuf >=4.24.4,<4.24.5.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/libarrow-substrait-14.0.1-h8ec153b_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/libarrow-substrait-14.0.1-h2cc6c1c_2_cpu.conda
   hash:
-    md5: 9f5c9e8bfbbcc4f0c432bed4974ed708
-    sha256: 604ef1ca26610092f29b1b2a69945158d8b7dd2ccdb3ac976d24edde6f826ea0
-  build: h8ec153b_1_cpu
+    md5: a1ef4ed049070f00fff873e191cfc963
+    sha256: 0b2b7ca6d1bfed324bf38d3e884ec27a35bdc72f91962835db804d4fefc8bdfd
+  build: h2cc6c1c_2_cpu
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 454310
-  timestamp: 1699524662962
+  size: 454922
+  timestamp: 1699954978847
 - platform: osx-arm64
   name: libarrow-substrait
   version: 14.0.1
@@ -13255,22 +13439,22 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - libarrow 14.0.1 h7bb5718_1_cpu
-  - libarrow-acero 14.0.1 had9dd58_1_cpu
-  - libarrow-dataset 14.0.1 had9dd58_1_cpu
+  - libarrow 14.0.1 ha4caa07_2_cpu
+  - libarrow-acero 14.0.1 had9dd58_2_cpu
+  - libarrow-dataset 14.0.1 had9dd58_2_cpu
   - libcxx >=15.0.7
   - libprotobuf >=4.24.4,<4.24.5.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-substrait-14.0.1-h594d712_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-substrait-14.0.1-h594d712_2_cpu.conda
   hash:
-    md5: c727e569e0812a90c7321ae79e387843
-    sha256: 49c6e1477c59334222fd25730b942e0dfb4b5bfba79fc173bc5ab5ba09e7a671
-  build: h594d712_1_cpu
+    md5: ed5296f02f1d32d5c7a3b67d5da3135d
+    sha256: 717c656d250ee2f4d3cce91617b7c2afc1ba0a1cbf437f634f1cd33a3d1d870d
+  build: h594d712_2_cpu
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 475366
-  timestamp: 1699524998776
+  size: 475619
+  timestamp: 1699954669839
 - platform: win-64
   name: libarrow-substrait
   version: 14.0.1
@@ -13279,24 +13463,24 @@ package:
   dependencies:
   - libabseil * cxx17*
   - libabseil >=20230802.1,<20230803.0a0
-  - libarrow 14.0.1 h85f1704_1_cpu
-  - libarrow-acero 14.0.1 h63175ca_1_cpu
-  - libarrow-dataset 14.0.1 h63175ca_1_cpu
+  - libarrow 14.0.1 h0850d3a_2_cpu
+  - libarrow-acero 14.0.1 h63175ca_2_cpu
+  - libarrow-dataset 14.0.1 h63175ca_2_cpu
   - libprotobuf >=4.24.4,<4.24.5.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/libarrow-substrait-14.0.1-hd4c9904_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/libarrow-substrait-14.0.1-hd4c9904_2_cpu.conda
   hash:
-    md5: 5bdb8100ce0267c80ac3844b8486e90a
-    sha256: f0cb407c0ec9d2716c057317dab96cfb567601a2856cd3cf6316571a4dfec96a
-  build: hd4c9904_1_cpu
+    md5: 55d3f374ec228a2dbe5bb8a2c3fc651b
+    sha256: 91ca6e247b5fc7a01eb30f546f105c94b5c3c493fe19fa742c839916be79a537
+  build: hd4c9904_2_cpu
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 348656
-  timestamp: 1699524367780
+  size: 348336
+  timestamp: 1699954877818
 - platform: linux-64
   name: libblas
   version: 3.9.0
@@ -14599,20 +14783,20 @@ package:
   dependencies:
   - _libgcc_mutex 0.1 conda_forge
   - _openmp_mutex >=4.5
-  url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h807b86a_2.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h807b86a_3.conda
   hash:
-    md5: c28003b0be0494f9a7664389146716ff
-    sha256: d361d3c87c376642b99c1fc25cddec4b9905d3d9b9203c1c545b8c8c1b04539a
-  build: h807b86a_2
+    md5: 23fdf1fef05baeb7eadc2aed5fb0011f
+    sha256: 5e88f658e07a30ab41b154b42c59f079b168acfa9551a75bdc972099453f4105
+  build: h807b86a_3
   arch: x86_64
   subdir: linux-64
-  build_number: 2
+  build_number: 3
   constrains:
-  - libgomp 13.2.0 h807b86a_2
+  - libgomp 13.2.0 h807b86a_3
   license: GPL-3.0-only WITH GCC-exception-3.1
   license_family: GPL
-  size: 771133
-  timestamp: 1695219384393
+  size: 773629
+  timestamp: 1699753612541
 - platform: linux-64
   name: libgcrypt
   version: 1.10.2
@@ -14661,7 +14845,7 @@ package:
   - libkml >=1.3.0,<1.4.0a0
   - libnetcdf >=4.9.2,<4.9.3.0a0
   - libpng >=1.6.39,<1.7.0a0
-  - libpq >=16.0,<17.0a0
+  - libpq >=16.1,<17.0a0
   - libspatialite >=5.1.0,<5.2.0a0
   - libsqlite >=3.44.0,<4.0a0
   - libstdcxx-ng >=12
@@ -14681,18 +14865,18 @@ package:
   - xerces-c >=3.2.4,<3.3.0a0
   - xz >=5.2.6,<6.0a0
   - zstd >=1.5.5,<1.6.0a0
-  url: https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.7.3-h6f3d308_2.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.7.3-h6f3d308_3.conda
   hash:
-    md5: 267f4fae4ab6352f9e74b06cc75d3341
-    sha256: 9f5bea2846012b86693dd60f11b9cfc7f36569a6820e4ebf288288e4e7b44170
-  build: h6f3d308_2
+    md5: 4e54b97f9e8a71f8a9945cbd2d905252
+    sha256: f17f7e3926894867b9eb048f7a3032b67d59600fb1d0f0555bf0a32b1d4deefa
+  build: h6f3d308_3
   arch: x86_64
   subdir: linux-64
-  build_number: 2
+  build_number: 3
   license: MIT
   license_family: MIT
-  size: 10588505
-  timestamp: 1699112162770
+  size: 10626102
+  timestamp: 1699853802742
 - platform: osx-64
   name: libgdal
   version: 3.7.3
@@ -14721,7 +14905,7 @@ package:
   - libkml >=1.3.0,<1.4.0a0
   - libnetcdf >=4.9.2,<4.9.3.0a0
   - libpng >=1.6.39,<1.7.0a0
-  - libpq >=16.0,<17.0a0
+  - libpq >=16.1,<17.0a0
   - libspatialite >=5.1.0,<5.2.0a0
   - libsqlite >=3.44.0,<4.0a0
   - libtiff >=4.6.0,<4.7.0a0
@@ -14739,18 +14923,18 @@ package:
   - xerces-c >=3.2.4,<3.3.0a0
   - xz >=5.2.6,<6.0a0
   - zstd >=1.5.5,<1.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.7.3-h926149b_2.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.7.3-h926149b_3.conda
   hash:
-    md5: 6acf790f6e56f4b8c86f28fd18932af3
-    sha256: 05f04a02d6fc654a60c8ef138435e9ea54938ec250876bfc5d95191cbd4c32f5
-  build: h926149b_2
+    md5: 3f4e1c554592171712c377cc74f302fc
+    sha256: 67667053ddb83c0ad45d0927b3c597dbeea89105ee6c73938f7fee570fd9b50f
+  build: h926149b_3
   arch: x86_64
   subdir: osx-64
-  build_number: 2
+  build_number: 3
   license: MIT
   license_family: MIT
-  size: 8974975
-  timestamp: 1699113079107
+  size: 8973148
+  timestamp: 1699855015179
 - platform: osx-arm64
   name: libgdal
   version: 3.7.3
@@ -14779,7 +14963,7 @@ package:
   - libkml >=1.3.0,<1.4.0a0
   - libnetcdf >=4.9.2,<4.9.3.0a0
   - libpng >=1.6.39,<1.7.0a0
-  - libpq >=16.0,<17.0a0
+  - libpq >=16.1,<17.0a0
   - libspatialite >=5.1.0,<5.2.0a0
   - libsqlite >=3.44.0,<4.0a0
   - libtiff >=4.6.0,<4.7.0a0
@@ -14797,18 +14981,18 @@ package:
   - xerces-c >=3.2.4,<3.3.0a0
   - xz >=5.2.6,<6.0a0
   - zstd >=1.5.5,<1.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.7.3-h116f65a_2.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.7.3-h116f65a_3.conda
   hash:
-    md5: 443049f0504187a1d7665ddda55aee20
-    sha256: a45afe33e6969de792e704de805878a34b3641a81fc45764acb467a529f17ade
-  build: h116f65a_2
+    md5: 5f76d0484e404f7e20c0b7eac61b44ab
+    sha256: 770126ba22c71572ee817f24171e01038bc43857d52842ab4b24a354b6c5f658
+  build: h116f65a_3
   arch: aarch64
   subdir: osx-arm64
-  build_number: 2
+  build_number: 3
   license: MIT
   license_family: MIT
-  size: 8183216
-  timestamp: 1699113267013
+  size: 8170459
+  timestamp: 1699855130834
 - platform: win-64
   name: libgdal
   version: 3.7.3
@@ -14833,7 +15017,7 @@ package:
   - libkml >=1.3.0,<1.4.0a0
   - libnetcdf >=4.9.2,<4.9.3.0a0
   - libpng >=1.6.39,<1.7.0a0
-  - libpq >=16.0,<17.0a0
+  - libpq >=16.1,<17.0a0
   - libspatialite >=5.1.0,<5.2.0a0
   - libsqlite >=3.44.0,<4.0a0
   - libtiff >=4.6.0,<4.7.0a0
@@ -14854,18 +15038,18 @@ package:
   - xerces-c >=3.2.4,<3.3.0a0
   - xz >=5.2.6,<6.0a0
   - zstd >=1.5.5,<1.6.0a0
-  url: https://conda.anaconda.org/conda-forge/win-64/libgdal-3.7.3-h3217549_2.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/libgdal-3.7.3-h3217549_3.conda
   hash:
-    md5: fdf86abe5276a43f453e5f6f066efc98
-    sha256: bf4e47c0cc1c0208ec394fe6cebf789e75b5c72555d63aff721a55e1a6be25f8
-  build: h3217549_2
+    md5: 9f04fc54f50770d3bd66a8ded2d7378d
+    sha256: a12cff0cbc52f1c479745c6a693614ef2b4588b84960e1791ee79ef2ef6e49f3
+  build: h3217549_3
   arch: x86_64
   subdir: win-64
-  build_number: 2
+  build_number: 3
   license: MIT
   license_family: MIT
-  size: 8406778
-  timestamp: 1699113058758
+  size: 8432103
+  timestamp: 1699855119123
 - platform: osx-64
   name: libgfortran
   version: 5.0.0
@@ -14910,19 +15094,19 @@ package:
   category: main
   manager: conda
   dependencies:
-  - libgfortran5 13.2.0 ha4646dd_2
-  url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_2.conda
+  - libgfortran5 13.2.0 ha4646dd_3
+  url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_3.conda
   hash:
-    md5: e75a75a6eaf6f318dae2631158c46575
-    sha256: 767d71999e5386210fe2acaf1b67073e7943c2af538efa85c101e3401e94ff62
-  build: h69a702a_2
+    md5: 73031c79546ad06f1fe62e57fdd021bc
+    sha256: 5b918950b84605b6865de438757f507b1eff73c96fd562f7022c80028b088c14
+  build: h69a702a_3
   arch: x86_64
   subdir: linux-64
-  build_number: 2
+  build_number: 3
   license: GPL-3.0-only WITH GCC-exception-3.1
   license_family: GPL
-  size: 23722
-  timestamp: 1695219642066
+  size: 23837
+  timestamp: 1699753845201
 - platform: linux-64
   name: libgfortran5
   version: 13.2.0
@@ -14930,20 +15114,20 @@ package:
   manager: conda
   dependencies:
   - libgcc-ng >=13.2.0
-  url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-ha4646dd_2.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-ha4646dd_3.conda
   hash:
-    md5: 78fdab09d9138851dde2b5fe2a11019e
-    sha256: 55ecf5c46c05a98b4822a041d6e1cb196a7b0606126eb96b24131b7d2c8ca561
-  build: ha4646dd_2
+    md5: c714d905cdfa0e70200f68b80cc04764
+    sha256: 0084a1d29a4f8ee3b8edad80eb6c42e5f0480f054f28cf713fb314bebb347a50
+  build: ha4646dd_3
   arch: x86_64
   subdir: linux-64
-  build_number: 2
+  build_number: 3
   constrains:
   - libgfortran-ng 13.2.0
   license: GPL-3.0-only WITH GCC-exception-3.1
   license_family: GPL
-  size: 1441830
-  timestamp: 1695219403435
+  size: 1436929
+  timestamp: 1699753630186
 - platform: osx-64
   name: libgfortran5
   version: 13.2.0
@@ -15098,18 +15282,18 @@ package:
   manager: conda
   dependencies:
   - _libgcc_mutex 0.1 conda_forge
-  url: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h807b86a_2.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h807b86a_3.conda
   hash:
-    md5: e2042154faafe61969556f28bade94b9
-    sha256: e1e82348f8296abfe344162b3b5f0ddc2f504759ebeb8b337ba99beaae583b15
-  build: h807b86a_2
+    md5: 7124cbb46b13d395bdde68f2d215c989
+    sha256: 6ebedee39b6bbbc969715d0d7fa4b381cce67e1139862604ffa393f821c08e81
+  build: h807b86a_3
   arch: x86_64
   subdir: linux-64
-  build_number: 2
+  build_number: 3
   license: GPL-3.0-only WITH GCC-exception-3.1
   license_family: GPL
-  size: 421133
-  timestamp: 1695219303065
+  size: 421834
+  timestamp: 1699753531479
 - platform: linux-64
   name: libgoogle-cloud
   version: 2.12.0
@@ -16166,22 +16350,22 @@ package:
   category: main
   manager: conda
   dependencies:
-  - libarrow 14.0.1 h0406937_1_cpu
+  - libarrow 14.0.1 he5826ec_2_cpu
   - libgcc-ng >=12
   - libstdcxx-ng >=12
   - libthrift >=0.19.0,<0.19.1.0a0
   - openssl >=3.1.4,<4.0a0
-  url: https://conda.anaconda.org/conda-forge/linux-64/libparquet-14.0.1-h352af49_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libparquet-14.0.1-h352af49_2_cpu.conda
   hash:
-    md5: 5b5c9968e5872bc65a3f69a38c389003
-    sha256: 9d3e94b10d0cf5c71420a8f22ffd9f58189bc52a937296798b9c3bb5b5c75809
-  build: h352af49_1_cpu
+    md5: c8e0b6b4e56aa4767727db2f6a0b0282
+    sha256: 3b2a23163a8c9dae3d536e96035129708adf205dd1b00437ebeb4ec4ba61cd8c
+  build: h352af49_2_cpu
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 1165164
-  timestamp: 1699523578961
+  size: 1164190
+  timestamp: 1699953147691
 - platform: osx-64
   name: libparquet
   version: 14.0.1
@@ -16189,21 +16373,21 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - libarrow 14.0.1 hcf474e5_1_cpu
+  - libarrow 14.0.1 h3b78187_2_cpu
   - libcxx >=15.0.7
   - libthrift >=0.19.0,<0.19.1.0a0
   - openssl >=3.1.4,<4.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/libparquet-14.0.1-h27bd29f_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/libparquet-14.0.1-h27bd29f_2_cpu.conda
   hash:
-    md5: cdce7ef09dd1e78dc91c7b74854f8951
-    sha256: fae3fee3837aef40c973c4de0bd03d7bdcc4eeaeae65d1b8cdd0256d92284619
-  build: h27bd29f_1_cpu
+    md5: b00156dd2ef6c9c5c4f61493a46ea5e2
+    sha256: 9a2b234522ff85e23b1d74d048136f016e9c04040ed248a17e29fabeab9f218b
+  build: h27bd29f_2_cpu
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 930270
-  timestamp: 1699524487672
+  size: 929770
+  timestamp: 1699954782441
 - platform: osx-arm64
   name: libparquet
   version: 14.0.1
@@ -16211,44 +16395,44 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - libarrow 14.0.1 h7bb5718_1_cpu
+  - libarrow 14.0.1 ha4caa07_2_cpu
   - libcxx >=15.0.7
   - libthrift >=0.19.0,<0.19.1.0a0
   - openssl >=3.1.4,<4.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/libparquet-14.0.1-heaab74a_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/libparquet-14.0.1-heaab74a_2_cpu.conda
   hash:
-    md5: 29ec8382d4d8da63ded09a173c635087
-    sha256: a9cbe2f62f01fd6ab974f3ba65995e8d64bf53b65c9fad26f9e1ad403dce0ea8
-  build: heaab74a_1_cpu
+    md5: ceb10b8adde9de6f3bf01a945b248f4d
+    sha256: 308ae959e9223dc3862a5d9aefe24a6918b84f511d08cfe1b8236366ddf5facf
+  build: heaab74a_2_cpu
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 915916
-  timestamp: 1699524745535
+  size: 914213
+  timestamp: 1699954415535
 - platform: win-64
   name: libparquet
   version: 14.0.1
   category: main
   manager: conda
   dependencies:
-  - libarrow 14.0.1 h85f1704_1_cpu
+  - libarrow 14.0.1 h0850d3a_2_cpu
   - libthrift >=0.19.0,<0.19.1.0a0
   - openssl >=3.1.4,<4.0a0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/libparquet-14.0.1-h7ec3a38_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/libparquet-14.0.1-h7ec3a38_2_cpu.conda
   hash:
-    md5: c2290b2f18c536f1e5db23e82e6fc9a5
-    sha256: 2d3410fe40bb3580788ddf48167b8e9d6a010fef15b58a0127c70ab751958e1d
-  build: h7ec3a38_1_cpu
+    md5: 807d38dd0a7b903c5f551da05388827a
+    sha256: 6518cf7276aaec254d07e0e6bd69f5812f26651a85f48c70918604d731d25b98
+  build: h7ec3a38_2_cpu
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 2
   license: Apache-2.0
-  size: 783950
-  timestamp: 1699524211045
+  size: 782702
+  timestamp: 1699954688495
 - platform: linux-64
   name: libpng
   version: 1.6.39
@@ -17147,18 +17331,18 @@ package:
   category: main
   manager: conda
   dependencies: []
-  url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-h7e041cc_2.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-h7e041cc_3.conda
   hash:
-    md5: 9172c297304f2a20134fc56c97fbe229
-    sha256: ab22ecdc974cdbe148874ea876d9c564294d5eafa760f403ed4fd495307b4243
-  build: h7e041cc_2
+    md5: 937eaed008f6bf2191c5fe76f87755e9
+    sha256: 6c6c49efedcc5709a66f19fb6b26b69c6a5245310fd1d9a901fd5e38aaf7f882
+  build: h7e041cc_3
   arch: x86_64
   subdir: linux-64
-  build_number: 2
+  build_number: 3
   license: GPL-3.0-only WITH GCC-exception-3.1
   license_family: GPL
-  size: 3842773
-  timestamp: 1695219454837
+  size: 3842940
+  timestamp: 1699753676253
 - platform: linux-64
   name: libsystemd0
   version: '254'
@@ -18934,7 +19118,7 @@ package:
   timestamp: 1639515992326
 - platform: linux-64
   name: minizip
-  version: 4.0.2
+  version: 4.0.3
   category: main
   manager: conda
   dependencies:
@@ -18946,21 +19130,21 @@ package:
   - openssl >=3.1.4,<4.0a0
   - xz >=5.2.6,<6.0a0
   - zstd >=1.5.5,<1.6.0a0
-  url: https://conda.anaconda.org/conda-forge/linux-64/minizip-4.0.2-h0ab5242_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/minizip-4.0.3-h0ab5242_0.conda
   hash:
-    md5: c6eafb51b60db59fd2132f6bbaada9b3
-    sha256: 97bc17dd33c8339bd380cbddaa3256b7b77b08a7db6fd70e5a54519d237e8939
+    md5: 3f9b5f4400be3cee11b426a8cd653b7c
+    sha256: cf33c24fa8375d17fad4e1da631b4c2e8ed9a109480fa45c82fbfa2a7c5bdd41
   build: h0ab5242_0
   arch: x86_64
   subdir: linux-64
   build_number: 0
   license: Zlib
   license_family: Other
-  size: 91289
-  timestamp: 1698348512961
+  size: 92378
+  timestamp: 1699930958451
 - platform: osx-64
   name: minizip
-  version: 4.0.2
+  version: 4.0.3
   category: main
   manager: conda
   dependencies:
@@ -18972,21 +19156,21 @@ package:
   - openssl >=3.1.4,<4.0a0
   - xz >=5.2.6,<6.0a0
   - zstd >=1.5.5,<1.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-64/minizip-4.0.2-h23f18a7_0.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/minizip-4.0.3-h23f18a7_0.conda
   hash:
-    md5: 86f4435be14480ce928083cde62e9194
-    sha256: 15f1f8340693710d726a4d9063248119561c24c5922df268fad289028352dadc
+    md5: 2facac17555d3078a0abfbe20a331086
+    sha256: 779cdb3ee14c653b6094414c251164b2398e50b825ba44455c67e7deeb6e48e1
   build: h23f18a7_0
   arch: x86_64
   subdir: osx-64
   build_number: 0
   license: Zlib
   license_family: Other
-  size: 79162
-  timestamp: 1698348786967
+  size: 78841
+  timestamp: 1699931181751
 - platform: osx-arm64
   name: minizip
-  version: 4.0.2
+  version: 4.0.3
   category: main
   manager: conda
   dependencies:
@@ -18998,21 +19182,21 @@ package:
   - openssl >=3.1.4,<4.0a0
   - xz >=5.2.6,<6.0a0
   - zstd >=1.5.5,<1.6.0a0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/minizip-4.0.2-hd5cad61_0.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/minizip-4.0.3-hd5cad61_0.conda
   hash:
-    md5: 90adaefb38030b00a28dd07140ae7335
-    sha256: 57051f3bc2dedc7a4bcf31f36a463a683d3c131d8ff7a77bcf8be91455e70581
+    md5: 8f1bf9ea12bca129b7a3d49eec9efd76
+    sha256: 9db88831aa3485d98cad155d989d4de45edfec13e6cbe81b0093ba7e6ba8817d
   build: hd5cad61_0
   arch: aarch64
   subdir: osx-arm64
   build_number: 0
   license: Zlib
   license_family: Other
-  size: 78361
-  timestamp: 1698348818338
+  size: 77965
+  timestamp: 1699931186188
 - platform: win-64
   name: minizip
-  version: 4.0.2
+  version: 4.0.3
   category: main
   manager: conda
   dependencies:
@@ -19023,18 +19207,18 @@ package:
   - vc14_runtime >=14.29.30139
   - xz >=5.2.6,<6.0a0
   - zstd >=1.5.5,<1.6.0a0
-  url: https://conda.anaconda.org/conda-forge/win-64/minizip-4.0.2-h5bed578_0.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/minizip-4.0.3-h5bed578_0.conda
   hash:
-    md5: b3fe453a894825361294e3fe57bb9022
-    sha256: 2e75ba252b81e4c3c10ffb513015b9a50a427206497c24f54c378ecf10faf1ac
+    md5: 958b153628ecd3bf3cfd1644e2385bb4
+    sha256: 317c43e644024f4ac820468f09c49d1f8491b14650e11d5c3516116320273c4b
   build: h5bed578_0
   arch: x86_64
   subdir: win-64
   build_number: 0
   license: Zlib
   license_family: Other
-  size: 84673
-  timestamp: 1698349061388
+  size: 84913
+  timestamp: 1699931497035
 - platform: linux-64
   name: mistune
   version: 3.0.2
@@ -19493,7 +19677,7 @@ package:
   timestamp: 1600387789153
 - platform: linux-64
   name: mypy
-  version: 1.6.1
+  version: 1.7.0
   category: main
   manager: conda
   dependencies:
@@ -19503,21 +19687,21 @@ package:
   - python >=3.12,<3.13.0a0
   - python_abi 3.12.* *_cp312
   - typing_extensions >=4.1.0
-  url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.6.1-py312h98912ed_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.7.0-py312h98912ed_0.conda
   hash:
-    md5: 27d6ce6c7539c9493030aa5cba62ec32
-    sha256: df633e6eebffc3ed3a2a2883b12409ee3e63e8019c02ba87667d9480f03da378
+    md5: 8983c781f7262f3128782af89b99bf32
+    sha256: 9ea860676ba4195cac2876dfac92594344a506fc98b05d98e06652bbf6fda1f5
   build: py312h98912ed_0
   arch: x86_64
   subdir: linux-64
   build_number: 0
   license: MIT
   license_family: MIT
-  size: 16035506
-  timestamp: 1697636057072
+  size: 16318531
+  timestamp: 1699638442049
 - platform: osx-64
   name: mypy
-  version: 1.6.1
+  version: 1.7.0
   category: main
   manager: conda
   dependencies:
@@ -19526,21 +19710,21 @@ package:
   - python >=3.12,<3.13.0a0
   - python_abi 3.12.* *_cp312
   - typing_extensions >=4.1.0
-  url: https://conda.anaconda.org/conda-forge/osx-64/mypy-1.6.1-py312h41838bb_0.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/mypy-1.7.0-py312h41838bb_0.conda
   hash:
-    md5: ef810fadf3d876440850ff35bd9a4c54
-    sha256: 8cc191852626be8b97655aeb74a1362c262eab0ca3e8d6f922104a57f185c5bb
+    md5: 8ed6dd59367040a076ca6e9d6318d5c7
+    sha256: 17303e31814d47ec3d363735d5ed1aca9db4d43fc9d09ace97479f119c7629c3
   build: py312h41838bb_0
   arch: x86_64
   subdir: osx-64
   build_number: 0
   license: MIT
   license_family: MIT
-  size: 9966565
-  timestamp: 1697636286117
+  size: 10185802
+  timestamp: 1699638517323
 - platform: osx-arm64
   name: mypy
-  version: 1.6.1
+  version: 1.7.0
   category: main
   manager: conda
   dependencies:
@@ -19550,21 +19734,21 @@ package:
   - python >=3.12,<3.13.0a0 *_cpython
   - python_abi 3.12.* *_cp312
   - typing_extensions >=4.1.0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/mypy-1.6.1-py312he37b823_0.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/mypy-1.7.0-py312he37b823_0.conda
   hash:
-    md5: 9d7dcf739655f43bdd1628de2b9c0b01
-    sha256: 68d42272a73cd73e5c98db038fd6bfa94e24cf086b6e7f21a6be5359ea4fe00c
+    md5: b47b01bc28612fc9ae8edb5fc88c3613
+    sha256: 60c60e94f5ed7e6921da97286bf946282b2e1bfa753a339d3c09d33626934709
   build: py312he37b823_0
   arch: aarch64
   subdir: osx-arm64
   build_number: 0
   license: MIT
   license_family: MIT
-  size: 9281179
-  timestamp: 1697636574313
+  size: 9518269
+  timestamp: 1699639141957
 - platform: win-64
   name: mypy
-  version: 1.6.1
+  version: 1.7.0
   category: main
   manager: conda
   dependencies:
@@ -19576,18 +19760,18 @@ package:
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/mypy-1.6.1-py312he70551f_0.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/mypy-1.7.0-py312he70551f_0.conda
   hash:
-    md5: c8a2276a4957d6058c37d11d22f35329
-    sha256: 860627fb8ec3173cd9c9e5903776b12735193f3dde7bbaa28ebf3ad4d7a41592
+    md5: 01c03fdd9a4f3ce7fd0d6a7e52d93ba0
+    sha256: 9aabdbac343f35b1deb2da601727599aff6491fdb6c3c6c03faf6ef921406981
   build: py312he70551f_0
   arch: x86_64
   subdir: win-64
   build_number: 0
   license: MIT
   license_family: MIT
-  size: 8042073
-  timestamp: 1697636464855
+  size: 8239186
+  timestamp: 1699638398808
 - platform: linux-64
   name: mypy_extensions
   version: 1.0.0
@@ -21402,7 +21586,7 @@ package:
   timestamp: 1696202521121
 - platform: linux-64
   name: pandas
-  version: 2.1.2
+  version: 2.1.3
   category: main
   manager: conda
   dependencies:
@@ -21414,21 +21598,21 @@ package:
   - python-tzdata >=2022a
   - python_abi 3.12.* *_cp312
   - pytz >=2020.1
-  url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.1.2-py312hfb8ada1_0.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.1.3-py312hfb8ada1_0.conda
   hash:
-    md5: 53c435c54c12d902c6e0c7979711fac4
-    sha256: 3803cf6ab2a8dc7247514a6a65a19821f5039e1d8a097b85c1adf5e95d65384f
+    md5: ef74af58f348d62a35c58e82aef5f868
+    sha256: 9dbdcf22a8e85b5c1794e3ccba46c3c8d18a3e985da05a84387fe8f98f4a0124
   build: py312hfb8ada1_0
   arch: x86_64
   subdir: linux-64
   build_number: 0
   license: BSD-3-Clause
   license_family: BSD
-  size: 14676378
-  timestamp: 1698376343634
+  size: 14692219
+  timestamp: 1699670548374
 - platform: osx-64
   name: pandas
-  version: 2.1.2
+  version: 2.1.3
   category: main
   manager: conda
   dependencies:
@@ -21440,21 +21624,21 @@ package:
   - python-tzdata >=2022a
   - python_abi 3.12.* *_cp312
   - pytz >=2020.1
-  url: https://conda.anaconda.org/conda-forge/osx-64/pandas-2.1.2-py312haf8ecfc_0.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/pandas-2.1.3-py312haf8ecfc_0.conda
   hash:
-    md5: 33f2969aade3bd3b4547213076407ca2
-    sha256: d1e64e1106e38f7b6cb805f3c05cc5cb24554a5f2c43cdcdc6309d22ed541d38
+    md5: d96a4b2b3dc4ae11f7fc8b736a12c3fb
+    sha256: de8ed7207373a5f8d5393c1a5b4478c52fb1ebcc233894205d7640131bbcdfcb
   build: py312haf8ecfc_0
   arch: x86_64
   subdir: osx-64
   build_number: 0
   license: BSD-3-Clause
   license_family: BSD
-  size: 13992457
-  timestamp: 1698442848959
+  size: 14009292
+  timestamp: 1699671183218
 - platform: osx-arm64
   name: pandas
-  version: 2.1.2
+  version: 2.1.3
   category: main
   manager: conda
   dependencies:
@@ -21467,21 +21651,21 @@ package:
   - python-tzdata >=2022a
   - python_abi 3.12.* *_cp312
   - pytz >=2020.1
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/pandas-2.1.2-py312h9e53831_0.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/pandas-2.1.3-py312h9e53831_0.conda
   hash:
-    md5: b5679ff30089add51c6004649a8c91b0
-    sha256: c15121e879b6361937931512a87ff86c56a5398fecc1b6cf4a419d8b49fcaf92
+    md5: 7d6935d78f7582a78c1b57b82a538db5
+    sha256: 83aff89ff45ebec68adfad5bfec4a7f8a77b3974a60eb8ccf0a1e350b8af845c
   build: py312h9e53831_0
   arch: aarch64
   subdir: osx-arm64
   build_number: 0
   license: BSD-3-Clause
   license_family: BSD
-  size: 13862650
-  timestamp: 1698376585365
+  size: 13897581
+  timestamp: 1699671080166
 - platform: win-64
   name: pandas
-  version: 2.1.2
+  version: 2.1.3
   category: main
   manager: conda
   dependencies:
@@ -21494,18 +21678,18 @@ package:
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/pandas-2.1.2-py312h2ab9e98_0.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/pandas-2.1.3-py312h2ab9e98_0.conda
   hash:
-    md5: 7a9d64a8cb9173d13807b9c23342c58f
-    sha256: 58d3c4047053175c229855588e3a0dba1e751d2baf0688d1bdc68fc9006be8ff
+    md5: 9719f7ff92b362df61e8e6abf5886742
+    sha256: a4207972ce906f6647c48fca868116cc243c87a391307544e3a270c7edb7f317
   build: py312h2ab9e98_0
   arch: x86_64
   subdir: win-64
   build_number: 0
   license: BSD-3-Clause
   license_family: BSD
-  size: 13498028
-  timestamp: 1698376797033
+  size: 13538431
+  timestamp: 1699670949801
 - platform: linux-64
   name: pandas-stubs
   version: 2.1.1.230928
@@ -23749,252 +23933,244 @@ package:
   category: main
   manager: conda
   dependencies:
-  - python >=3.6
-  url: https://conda.anaconda.org/conda-forge/noarch/prometheus_client-0.18.0-pyhd8ed1ab_0.conda
+  - python >=3.8
+  url: https://conda.anaconda.org/conda-forge/noarch/prometheus_client-0.18.0-pyhd8ed1ab_1.conda
   hash:
-    md5: ade903cbe0b4440ca6bed64932d124b5
-    sha256: 0e0257eee11d3e0b3f73566283fd6c705b1b2a5dbc7d9a609fa885519a62913e
-  build: pyhd8ed1ab_0
+    md5: 46f6be657443caffcc7201d51c07aadf
+    sha256: dca35462761fe9a06f348a0e6216a7a5934e3e29c33bc8e173fb344116568a95
+  build: pyhd8ed1ab_1
   arch: x86_64
   subdir: linux-64
-  build_number: 0
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
   noarch: python
-  size: 53959
-  timestamp: 1698692692135
+  size: 53871
+  timestamp: 1699962321058
 - platform: osx-64
   name: prometheus_client
   version: 0.18.0
   category: main
   manager: conda
   dependencies:
-  - python >=3.6
-  url: https://conda.anaconda.org/conda-forge/noarch/prometheus_client-0.18.0-pyhd8ed1ab_0.conda
+  - python >=3.8
+  url: https://conda.anaconda.org/conda-forge/noarch/prometheus_client-0.18.0-pyhd8ed1ab_1.conda
   hash:
-    md5: ade903cbe0b4440ca6bed64932d124b5
-    sha256: 0e0257eee11d3e0b3f73566283fd6c705b1b2a5dbc7d9a609fa885519a62913e
-  build: pyhd8ed1ab_0
+    md5: 46f6be657443caffcc7201d51c07aadf
+    sha256: dca35462761fe9a06f348a0e6216a7a5934e3e29c33bc8e173fb344116568a95
+  build: pyhd8ed1ab_1
   arch: x86_64
   subdir: osx-64
-  build_number: 0
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
   noarch: python
-  size: 53959
-  timestamp: 1698692692135
+  size: 53871
+  timestamp: 1699962321058
 - platform: osx-arm64
   name: prometheus_client
   version: 0.18.0
   category: main
   manager: conda
   dependencies:
-  - python >=3.6
-  url: https://conda.anaconda.org/conda-forge/noarch/prometheus_client-0.18.0-pyhd8ed1ab_0.conda
+  - python >=3.8
+  url: https://conda.anaconda.org/conda-forge/noarch/prometheus_client-0.18.0-pyhd8ed1ab_1.conda
   hash:
-    md5: ade903cbe0b4440ca6bed64932d124b5
-    sha256: 0e0257eee11d3e0b3f73566283fd6c705b1b2a5dbc7d9a609fa885519a62913e
-  build: pyhd8ed1ab_0
+    md5: 46f6be657443caffcc7201d51c07aadf
+    sha256: dca35462761fe9a06f348a0e6216a7a5934e3e29c33bc8e173fb344116568a95
+  build: pyhd8ed1ab_1
   arch: aarch64
   subdir: osx-arm64
-  build_number: 0
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
   noarch: python
-  size: 53959
-  timestamp: 1698692692135
+  size: 53871
+  timestamp: 1699962321058
 - platform: win-64
   name: prometheus_client
   version: 0.18.0
   category: main
   manager: conda
   dependencies:
-  - python >=3.6
-  url: https://conda.anaconda.org/conda-forge/noarch/prometheus_client-0.18.0-pyhd8ed1ab_0.conda
+  - python >=3.8
+  url: https://conda.anaconda.org/conda-forge/noarch/prometheus_client-0.18.0-pyhd8ed1ab_1.conda
   hash:
-    md5: ade903cbe0b4440ca6bed64932d124b5
-    sha256: 0e0257eee11d3e0b3f73566283fd6c705b1b2a5dbc7d9a609fa885519a62913e
-  build: pyhd8ed1ab_0
+    md5: 46f6be657443caffcc7201d51c07aadf
+    sha256: dca35462761fe9a06f348a0e6216a7a5934e3e29c33bc8e173fb344116568a95
+  build: pyhd8ed1ab_1
   arch: x86_64
   subdir: win-64
-  build_number: 0
+  build_number: 1
   license: Apache-2.0
   license_family: Apache
   noarch: python
-  size: 53959
-  timestamp: 1698692692135
+  size: 53871
+  timestamp: 1699962321058
 - platform: linux-64
   name: prompt-toolkit
-  version: 3.0.39
+  version: 3.0.41
   category: main
   manager: conda
   dependencies:
   - python >=3.7
   - wcwidth
-  url: https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.39-pyha770c72_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.41-pyha770c72_0.conda
   hash:
-    md5: a4986c6bb5b0d05a38855b0880a5f425
-    sha256: 10e7fdc75d4b85633be6b12a70b857053987127a808caa0f88b2cba4b3ce6359
+    md5: f511a993aa4336bef9dd874ee3403e67
+    sha256: e26a5554883a0eada3641b6d861d8cb4895e2c7fcc17a587de07b8b1ecbfff0f
   build: pyha770c72_0
   arch: x86_64
   subdir: linux-64
   build_number: 0
   constrains:
-  - prompt_toolkit 3.0.39
+  - prompt_toolkit 3.0.41
   license: BSD-3-Clause
-  license_family: BSD
   noarch: python
-  size: 269068
-  timestamp: 1688566090973
+  size: 269969
+  timestamp: 1699963207861
 - platform: osx-64
   name: prompt-toolkit
-  version: 3.0.39
+  version: 3.0.41
   category: main
   manager: conda
   dependencies:
   - python >=3.7
   - wcwidth
-  url: https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.39-pyha770c72_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.41-pyha770c72_0.conda
   hash:
-    md5: a4986c6bb5b0d05a38855b0880a5f425
-    sha256: 10e7fdc75d4b85633be6b12a70b857053987127a808caa0f88b2cba4b3ce6359
+    md5: f511a993aa4336bef9dd874ee3403e67
+    sha256: e26a5554883a0eada3641b6d861d8cb4895e2c7fcc17a587de07b8b1ecbfff0f
   build: pyha770c72_0
   arch: x86_64
   subdir: osx-64
   build_number: 0
   constrains:
-  - prompt_toolkit 3.0.39
+  - prompt_toolkit 3.0.41
   license: BSD-3-Clause
-  license_family: BSD
   noarch: python
-  size: 269068
-  timestamp: 1688566090973
+  size: 269969
+  timestamp: 1699963207861
 - platform: osx-arm64
   name: prompt-toolkit
-  version: 3.0.39
+  version: 3.0.41
   category: main
   manager: conda
   dependencies:
   - python >=3.7
   - wcwidth
-  url: https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.39-pyha770c72_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.41-pyha770c72_0.conda
   hash:
-    md5: a4986c6bb5b0d05a38855b0880a5f425
-    sha256: 10e7fdc75d4b85633be6b12a70b857053987127a808caa0f88b2cba4b3ce6359
+    md5: f511a993aa4336bef9dd874ee3403e67
+    sha256: e26a5554883a0eada3641b6d861d8cb4895e2c7fcc17a587de07b8b1ecbfff0f
   build: pyha770c72_0
   arch: aarch64
   subdir: osx-arm64
   build_number: 0
   constrains:
-  - prompt_toolkit 3.0.39
+  - prompt_toolkit 3.0.41
   license: BSD-3-Clause
-  license_family: BSD
   noarch: python
-  size: 269068
-  timestamp: 1688566090973
+  size: 269969
+  timestamp: 1699963207861
 - platform: win-64
   name: prompt-toolkit
-  version: 3.0.39
+  version: 3.0.41
   category: main
   manager: conda
   dependencies:
   - python >=3.7
   - wcwidth
-  url: https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.39-pyha770c72_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.41-pyha770c72_0.conda
   hash:
-    md5: a4986c6bb5b0d05a38855b0880a5f425
-    sha256: 10e7fdc75d4b85633be6b12a70b857053987127a808caa0f88b2cba4b3ce6359
+    md5: f511a993aa4336bef9dd874ee3403e67
+    sha256: e26a5554883a0eada3641b6d861d8cb4895e2c7fcc17a587de07b8b1ecbfff0f
   build: pyha770c72_0
   arch: x86_64
   subdir: win-64
   build_number: 0
   constrains:
-  - prompt_toolkit 3.0.39
+  - prompt_toolkit 3.0.41
   license: BSD-3-Clause
-  license_family: BSD
   noarch: python
-  size: 269068
-  timestamp: 1688566090973
+  size: 269969
+  timestamp: 1699963207861
 - platform: linux-64
   name: prompt_toolkit
-  version: 3.0.39
+  version: 3.0.41
   category: main
   manager: conda
   dependencies:
-  - prompt-toolkit >=3.0.39,<3.0.40.0a0
-  url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.39-hd8ed1ab_0.conda
+  - prompt-toolkit >=3.0.41,<3.0.42.0a0
+  url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.41-hd8ed1ab_0.conda
   hash:
-    md5: 4bbbe67d5df19db30f04b8e344dc9976
-    sha256: 89f7fecc7355181dbc2ab851e668a2fce6aa4830b336a34c93b59bda93206270
+    md5: b1387bd091fa0420557f801a78587678
+    sha256: dd2fea25930d258159441ad4a45e5d3274f0d2f1dea92fe25b44b48c486aa969
   build: hd8ed1ab_0
   arch: x86_64
   subdir: linux-64
   build_number: 0
   license: BSD-3-Clause
-  license_family: BSD
   noarch: generic
-  size: 6731
-  timestamp: 1688566099039
+  size: 6704
+  timestamp: 1699963217068
 - platform: osx-64
   name: prompt_toolkit
-  version: 3.0.39
+  version: 3.0.41
   category: main
   manager: conda
   dependencies:
-  - prompt-toolkit >=3.0.39,<3.0.40.0a0
-  url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.39-hd8ed1ab_0.conda
+  - prompt-toolkit >=3.0.41,<3.0.42.0a0
+  url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.41-hd8ed1ab_0.conda
   hash:
-    md5: 4bbbe67d5df19db30f04b8e344dc9976
-    sha256: 89f7fecc7355181dbc2ab851e668a2fce6aa4830b336a34c93b59bda93206270
+    md5: b1387bd091fa0420557f801a78587678
+    sha256: dd2fea25930d258159441ad4a45e5d3274f0d2f1dea92fe25b44b48c486aa969
   build: hd8ed1ab_0
   arch: x86_64
   subdir: osx-64
   build_number: 0
   license: BSD-3-Clause
-  license_family: BSD
   noarch: generic
-  size: 6731
-  timestamp: 1688566099039
+  size: 6704
+  timestamp: 1699963217068
 - platform: osx-arm64
   name: prompt_toolkit
-  version: 3.0.39
+  version: 3.0.41
   category: main
   manager: conda
   dependencies:
-  - prompt-toolkit >=3.0.39,<3.0.40.0a0
-  url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.39-hd8ed1ab_0.conda
+  - prompt-toolkit >=3.0.41,<3.0.42.0a0
+  url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.41-hd8ed1ab_0.conda
   hash:
-    md5: 4bbbe67d5df19db30f04b8e344dc9976
-    sha256: 89f7fecc7355181dbc2ab851e668a2fce6aa4830b336a34c93b59bda93206270
+    md5: b1387bd091fa0420557f801a78587678
+    sha256: dd2fea25930d258159441ad4a45e5d3274f0d2f1dea92fe25b44b48c486aa969
   build: hd8ed1ab_0
   arch: aarch64
   subdir: osx-arm64
   build_number: 0
   license: BSD-3-Clause
-  license_family: BSD
   noarch: generic
-  size: 6731
-  timestamp: 1688566099039
+  size: 6704
+  timestamp: 1699963217068
 - platform: win-64
   name: prompt_toolkit
-  version: 3.0.39
+  version: 3.0.41
   category: main
   manager: conda
   dependencies:
-  - prompt-toolkit >=3.0.39,<3.0.40.0a0
-  url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.39-hd8ed1ab_0.conda
+  - prompt-toolkit >=3.0.41,<3.0.42.0a0
+  url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.41-hd8ed1ab_0.conda
   hash:
-    md5: 4bbbe67d5df19db30f04b8e344dc9976
-    sha256: 89f7fecc7355181dbc2ab851e668a2fce6aa4830b336a34c93b59bda93206270
+    md5: b1387bd091fa0420557f801a78587678
+    sha256: dd2fea25930d258159441ad4a45e5d3274f0d2f1dea92fe25b44b48c486aa969
   build: hd8ed1ab_0
   arch: x86_64
   subdir: win-64
   build_number: 0
   license: BSD-3-Clause
-  license_family: BSD
   noarch: generic
-  size: 6731
-  timestamp: 1688566099039
+  size: 6704
+  timestamp: 1699963217068
 - platform: linux-64
   name: psutil
   version: 5.9.5
@@ -24340,32 +24516,32 @@ package:
   category: main
   manager: conda
   dependencies:
-  - libarrow 14.0.1 h0406937_1_cpu
-  - libarrow-acero 14.0.1 h59595ed_1_cpu
-  - libarrow-dataset 14.0.1 h59595ed_1_cpu
-  - libarrow-flight 14.0.1 h120cb0d_1_cpu
-  - libarrow-flight-sql 14.0.1 h61ff412_1_cpu
-  - libarrow-gandiva 14.0.1 hacb8726_1_cpu
-  - libarrow-substrait 14.0.1 h61ff412_1_cpu
+  - libarrow 14.0.1 he5826ec_2_cpu
+  - libarrow-acero 14.0.1 h59595ed_2_cpu
+  - libarrow-dataset 14.0.1 h59595ed_2_cpu
+  - libarrow-flight 14.0.1 h120cb0d_2_cpu
+  - libarrow-flight-sql 14.0.1 h61ff412_2_cpu
+  - libarrow-gandiva 14.0.1 hacb8726_2_cpu
+  - libarrow-substrait 14.0.1 h61ff412_2_cpu
   - libgcc-ng >=12
-  - libparquet 14.0.1 h352af49_1_cpu
+  - libparquet 14.0.1 h352af49_2_cpu
   - libstdcxx-ng >=12
   - numpy >=1.26.0,<2.0a0
   - python >=3.12,<3.13.0a0
   - python_abi 3.12.* *_cp312
-  url: https://conda.anaconda.org/conda-forge/linux-64/pyarrow-14.0.1-py312h176e3d2_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/linux-64/pyarrow-14.0.1-py312h176e3d2_2_cpu.conda
   hash:
-    md5: d3c80e206062fded59159a29dab920a2
-    sha256: 2929558d9fcf2be0ddf491705ba5934f253dc73bf4d999cd09414399ae5c9b90
-  build: py312h176e3d2_1_cpu
+    md5: 9f119da7381c83eb1e3ba063b1b71a1e
+    sha256: e75a60df14e162d3459710e2a2226261b0e68b5e7a4666d24feb50eec8c563b8
+  build: py312h176e3d2_2_cpu
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 2
   constrains:
   - apache-arrow-proc =*=cpu
   license: Apache-2.0
-  size: 4482781
-  timestamp: 1699524823799
+  size: 4500334
+  timestamp: 1699955464738
 - platform: osx-64
   name: pyarrow
   version: 14.0.1
@@ -24373,31 +24549,31 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - libarrow 14.0.1 hcf474e5_1_cpu
-  - libarrow-acero 14.0.1 hc222712_1_cpu
-  - libarrow-dataset 14.0.1 hc222712_1_cpu
-  - libarrow-flight 14.0.1 ha1803ca_1_cpu
-  - libarrow-flight-sql 14.0.1 h8ec153b_1_cpu
-  - libarrow-gandiva 14.0.1 heeebe7c_1_cpu
-  - libarrow-substrait 14.0.1 h8ec153b_1_cpu
+  - libarrow 14.0.1 h3b78187_2_cpu
+  - libarrow-acero 14.0.1 hc222712_2_cpu
+  - libarrow-dataset 14.0.1 hc222712_2_cpu
+  - libarrow-flight 14.0.1 h440f1c2_2_cpu
+  - libarrow-flight-sql 14.0.1 h2cc6c1c_2_cpu
+  - libarrow-gandiva 14.0.1 heeebe7c_2_cpu
+  - libarrow-substrait 14.0.1 h2cc6c1c_2_cpu
   - libcxx >=15.0.7
-  - libparquet 14.0.1 h27bd29f_1_cpu
+  - libparquet 14.0.1 h27bd29f_2_cpu
   - numpy >=1.26.0,<2.0a0
   - python >=3.12,<3.13.0a0
   - python_abi 3.12.* *_cp312
-  url: https://conda.anaconda.org/conda-forge/osx-64/pyarrow-14.0.1-py312h10f8022_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-64/pyarrow-14.0.1-py312h10f8022_2_cpu.conda
   hash:
-    md5: 315d737cfe65e6de30bf40ea8ca38138
-    sha256: b1dcf2b70c7ca5563d5576ed174a76774fffc1cebc14eb4a00da4e31281b1c15
-  build: py312h10f8022_1_cpu
+    md5: f1e14c6c9e739e025a914c3550d5f7a4
+    sha256: 5119289982d9a6d29bb441725980398c28469f87ce77fc8f300bd29e7df82a15
+  build: py312h10f8022_2_cpu
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 2
   constrains:
   - apache-arrow-proc =*=cpu
   license: Apache-2.0
-  size: 3974235
-  timestamp: 1699527412371
+  size: 3989923
+  timestamp: 1699956846474
 - platform: osx-arm64
   name: pyarrow
   version: 14.0.1
@@ -24405,65 +24581,65 @@ package:
   manager: conda
   dependencies:
   - __osx >=10.9
-  - libarrow 14.0.1 h7bb5718_1_cpu
-  - libarrow-acero 14.0.1 had9dd58_1_cpu
-  - libarrow-dataset 14.0.1 had9dd58_1_cpu
-  - libarrow-flight 14.0.1 h1011bfc_1_cpu
-  - libarrow-flight-sql 14.0.1 h660fe36_1_cpu
-  - libarrow-gandiva 14.0.1 h2b96968_1_cpu
-  - libarrow-substrait 14.0.1 h594d712_1_cpu
+  - libarrow 14.0.1 ha4caa07_2_cpu
+  - libarrow-acero 14.0.1 had9dd58_2_cpu
+  - libarrow-dataset 14.0.1 had9dd58_2_cpu
+  - libarrow-flight 14.0.1 h1011bfc_2_cpu
+  - libarrow-flight-sql 14.0.1 h660fe36_2_cpu
+  - libarrow-gandiva 14.0.1 h2b96968_2_cpu
+  - libarrow-substrait 14.0.1 h594d712_2_cpu
   - libcxx >=15.0.7
-  - libparquet 14.0.1 heaab74a_1_cpu
+  - libparquet 14.0.1 heaab74a_2_cpu
   - numpy >=1.26.0,<2.0a0
   - python >=3.12,<3.13.0a0
   - python >=3.12,<3.13.0a0 *_cpython
   - python_abi 3.12.* *_cp312
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/pyarrow-14.0.1-py312h01ffab7_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/pyarrow-14.0.1-py312h01ffab7_2_cpu.conda
   hash:
-    md5: af7ede22023f83a80f22b753fff90b0f
-    sha256: 68593aab672286874b5bcf73e4be647df418cb4dfdb617a9c7fa152f566dfe7e
-  build: py312h01ffab7_1_cpu
+    md5: 1e4a9a50de08930ceb240a6e45d86a1b
+    sha256: e010b381684772c833af8165a0877738fb0c0bde767c9b1a9b3a264726b8ba30
+  build: py312h01ffab7_2_cpu
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 2
   constrains:
   - apache-arrow-proc =*=cpu
   license: Apache-2.0
-  size: 4031321
-  timestamp: 1699527504724
+  size: 4021545
+  timestamp: 1699957160465
 - platform: win-64
   name: pyarrow
   version: 14.0.1
   category: main
   manager: conda
   dependencies:
-  - libarrow 14.0.1 h85f1704_1_cpu
-  - libarrow-acero 14.0.1 h63175ca_1_cpu
-  - libarrow-dataset 14.0.1 h63175ca_1_cpu
-  - libarrow-flight 14.0.1 h53b1db0_1_cpu
-  - libarrow-flight-sql 14.0.1 h78eab7c_1_cpu
-  - libarrow-gandiva 14.0.1 hb2eaab1_1_cpu
-  - libarrow-substrait 14.0.1 hd4c9904_1_cpu
-  - libparquet 14.0.1 h7ec3a38_1_cpu
+  - libarrow 14.0.1 h0850d3a_2_cpu
+  - libarrow-acero 14.0.1 h63175ca_2_cpu
+  - libarrow-dataset 14.0.1 h63175ca_2_cpu
+  - libarrow-flight 14.0.1 h53b1db0_2_cpu
+  - libarrow-flight-sql 14.0.1 h78eab7c_2_cpu
+  - libarrow-gandiva 14.0.1 hb2eaab1_2_cpu
+  - libarrow-substrait 14.0.1 hd4c9904_2_cpu
+  - libparquet 14.0.1 h7ec3a38_2_cpu
   - numpy >=1.26.0,<2.0a0
   - python >=3.12,<3.13.0a0
   - python_abi 3.12.* *_cp312
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/pyarrow-14.0.1-py312h85e32bb_1_cpu.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/pyarrow-14.0.1-py312h85e32bb_2_cpu.conda
   hash:
-    md5: 01085bea09ebce9bfd2e693849d44b68
-    sha256: 2da99fc0f6180eb063e40c1860e714e19f35e2d91890df1050d215b6bc9eabc4
-  build: py312h85e32bb_1_cpu
+    md5: f7a8bcc4eb06c73b7760781a65d37378
+    sha256: 78433d266bf275276c84efb408ecd3dcf82887fb8e91510d339d439f7e4a4c16
+  build: py312h85e32bb_2_cpu
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 2
   constrains:
   - apache-arrow-proc =*=cpu
   license: Apache-2.0
-  size: 3406833
-  timestamp: 1699525907715
+  size: 3404603
+  timestamp: 1699958207127
 - platform: linux-64
   name: pycparser
   version: '2.21'
@@ -24546,93 +24722,185 @@ package:
   timestamp: 1636257201998
 - platform: linux-64
   name: pydantic
-  version: 1.10.13
+  version: 2.5.0
+  category: main
+  manager: conda
+  dependencies:
+  - annotated-types >=0.4.0
+  - pydantic-core 2.14.1
+  - python >=3.7
+  - typing-extensions >=4.6.1
+  url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.5.0-pyhd8ed1ab_0.conda
+  hash:
+    md5: e0c41d8a5ecffc34d6b7f2b49687c665
+    sha256: d513a539cb199ff35269d633844bed03138a2451d536fc7a9044f05c5a6c3e66
+  build: pyhd8ed1ab_0
+  arch: x86_64
+  subdir: linux-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 283055
+  timestamp: 1699947684640
+- platform: osx-64
+  name: pydantic
+  version: 2.5.0
+  category: main
+  manager: conda
+  dependencies:
+  - annotated-types >=0.4.0
+  - pydantic-core 2.14.1
+  - python >=3.7
+  - typing-extensions >=4.6.1
+  url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.5.0-pyhd8ed1ab_0.conda
+  hash:
+    md5: e0c41d8a5ecffc34d6b7f2b49687c665
+    sha256: d513a539cb199ff35269d633844bed03138a2451d536fc7a9044f05c5a6c3e66
+  build: pyhd8ed1ab_0
+  arch: x86_64
+  subdir: osx-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 283055
+  timestamp: 1699947684640
+- platform: osx-arm64
+  name: pydantic
+  version: 2.5.0
+  category: main
+  manager: conda
+  dependencies:
+  - annotated-types >=0.4.0
+  - pydantic-core 2.14.1
+  - python >=3.7
+  - typing-extensions >=4.6.1
+  url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.5.0-pyhd8ed1ab_0.conda
+  hash:
+    md5: e0c41d8a5ecffc34d6b7f2b49687c665
+    sha256: d513a539cb199ff35269d633844bed03138a2451d536fc7a9044f05c5a6c3e66
+  build: pyhd8ed1ab_0
+  arch: aarch64
+  subdir: osx-arm64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 283055
+  timestamp: 1699947684640
+- platform: win-64
+  name: pydantic
+  version: 2.5.0
+  category: main
+  manager: conda
+  dependencies:
+  - annotated-types >=0.4.0
+  - pydantic-core 2.14.1
+  - python >=3.7
+  - typing-extensions >=4.6.1
+  url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.5.0-pyhd8ed1ab_0.conda
+  hash:
+    md5: e0c41d8a5ecffc34d6b7f2b49687c665
+    sha256: d513a539cb199ff35269d633844bed03138a2451d536fc7a9044f05c5a6c3e66
+  build: pyhd8ed1ab_0
+  arch: x86_64
+  subdir: win-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 283055
+  timestamp: 1699947684640
+- platform: linux-64
+  name: pydantic-core
+  version: 2.14.1
   category: main
   manager: conda
   dependencies:
   - libgcc-ng >=12
   - python >=3.12,<3.13.0a0
   - python_abi 3.12.* *_cp312
-  - typing-extensions >=4.2.0
-  url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-1.10.13-py312h98912ed_1.conda
+  - typing-extensions >=4.6.0
+  url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-core-2.14.1-py312h4b3b743_0.conda
   hash:
-    md5: 9abab3ae2788e0fe4f989e2b65a8b148
-    sha256: b7c44d3d89af5ce0d3766b9fe3b4b1e272c9f458494b2424adbab3dd29514037
-  build: py312h98912ed_1
+    md5: 4224110962fc21296eee49cbac258041
+    sha256: 3acbcaa8d76563c918d4bc61002939b178e4c56aef0b534c6fb38144025c45da
+  build: py312h4b3b743_0
   arch: x86_64
   subdir: linux-64
-  build_number: 1
+  build_number: 0
   license: MIT
   license_family: MIT
-  size: 2176572
-  timestamp: 1697791429815
+  size: 1598329
+  timestamp: 1699546546860
 - platform: osx-64
-  name: pydantic
-  version: 1.10.13
+  name: pydantic-core
+  version: 2.14.1
   category: main
   manager: conda
   dependencies:
   - python >=3.12,<3.13.0a0
   - python_abi 3.12.* *_cp312
-  - typing-extensions >=4.2.0
-  url: https://conda.anaconda.org/conda-forge/osx-64/pydantic-1.10.13-py312h41838bb_1.conda
+  - typing-extensions >=4.6.0
+  url: https://conda.anaconda.org/conda-forge/osx-64/pydantic-core-2.14.1-py312h6e28e45_0.conda
   hash:
-    md5: d2fff399f77fc93f60859be930f7d3f3
-    sha256: 34400cadfb59b2f2846337e3aa80f5403bc6b38a229b7bd8502d164b61ff7d54
-  build: py312h41838bb_1
+    md5: 3904e69387bec987ff4816268332714a
+    sha256: 8ad92a96b106ea6c7fd3666bb38e84bac6aa09abbc47b46ae2b54326c6bbd71d
+  build: py312h6e28e45_0
   arch: x86_64
   subdir: osx-64
-  build_number: 1
+  build_number: 0
   license: MIT
   license_family: MIT
-  size: 1831496
-  timestamp: 1697791662162
+  size: 1512982
+  timestamp: 1699546762612
 - platform: osx-arm64
-  name: pydantic
-  version: 1.10.13
+  name: pydantic-core
+  version: 2.14.1
   category: main
   manager: conda
   dependencies:
   - python >=3.12,<3.13.0a0
   - python >=3.12,<3.13.0a0 *_cpython
   - python_abi 3.12.* *_cp312
-  - typing-extensions >=4.2.0
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/pydantic-1.10.13-py312he37b823_1.conda
+  - typing-extensions >=4.6.0
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/pydantic-core-2.14.1-py312h5280bc4_0.conda
   hash:
-    md5: 19d29a990bdc7b8b8878898ff3e7bfaa
-    sha256: 0d85db6f73d636e557ce179c32ed55d11fd5205d7b8a783a4eec4f7e673e39f7
-  build: py312he37b823_1
+    md5: 5a4048da8e007e085a0d4021d10e749b
+    sha256: 3e8b6135f7ee05c3f9e6f529c997989b11426cc13651641d635e49a3debf498c
+  build: py312h5280bc4_0
   arch: aarch64
   subdir: osx-arm64
-  build_number: 1
+  build_number: 0
   license: MIT
   license_family: MIT
-  size: 1786936
-  timestamp: 1697791847732
+  size: 1415842
+  timestamp: 1699546966200
 - platform: win-64
-  name: pydantic
-  version: 1.10.13
+  name: pydantic-core
+  version: 2.14.1
   category: main
   manager: conda
   dependencies:
   - python >=3.12,<3.13.0a0
   - python_abi 3.12.* *_cp312
-  - typing-extensions >=4.2.0
+  - typing-extensions >=4.6.0
   - ucrt >=10.0.20348.0
   - vc >=14.2,<15
   - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/pydantic-1.10.13-py312he70551f_1.conda
+  url: https://conda.anaconda.org/conda-forge/win-64/pydantic-core-2.14.1-py312hfccd98a_0.conda
   hash:
-    md5: fe9a72b7910a5731be071c435d37830e
-    sha256: 933fd92d1e0b998b06121e48bc4c16c20fceb7ac1a7ca90cddb05469f442abfa
-  build: py312he70551f_1
+    md5: 93099761407467630aa6bcb49e275b12
+    sha256: 15d548eff2ec2bf19d3b8625325f29b3dcab485db6d451ce08d3d9c64e9f419f
+  build: py312hfccd98a_0
   arch: x86_64
   subdir: win-64
-  build_number: 1
+  build_number: 0
   license: MIT
   license_family: MIT
-  size: 1457792
-  timestamp: 1697791605607
+  size: 1606597
+  timestamp: 1699547480840
 - platform: linux-64
   name: pygments
   version: 2.16.1
@@ -25184,91 +25452,6 @@ package:
   license_family: GPL
   size: 79366
   timestamp: 1695418564486
-- platform: linux-64
-  name: pyrsistent
-  version: 0.20.0
-  category: main
-  manager: conda
-  dependencies:
-  - libgcc-ng >=12
-  - python >=3.12,<3.13.0a0
-  - python_abi 3.12.* *_cp312
-  url: https://conda.anaconda.org/conda-forge/linux-64/pyrsistent-0.20.0-py312h98912ed_0.conda
-  hash:
-    md5: e69fbe5174c917efb19b381471828f45
-    sha256: 117fe1b5d36936931fae412536de3252b5068bd21ea48115ac52fe3adebf7a43
-  build: py312h98912ed_0
-  arch: x86_64
-  subdir: linux-64
-  build_number: 0
-  license: MIT
-  license_family: MIT
-  size: 122192
-  timestamp: 1698754175533
-- platform: osx-64
-  name: pyrsistent
-  version: 0.20.0
-  category: main
-  manager: conda
-  dependencies:
-  - python >=3.12,<3.13.0a0
-  - python_abi 3.12.* *_cp312
-  url: https://conda.anaconda.org/conda-forge/osx-64/pyrsistent-0.20.0-py312h41838bb_0.conda
-  hash:
-    md5: 59941193db795a09283db7be3b3b3404
-    sha256: 66756dd416d8e7b3dd97ca94d4e9a91abdfa48a964ca422457c56028b852e53b
-  build: py312h41838bb_0
-  arch: x86_64
-  subdir: osx-64
-  build_number: 0
-  license: MIT
-  license_family: MIT
-  size: 119154
-  timestamp: 1698753368561
-- platform: osx-arm64
-  name: pyrsistent
-  version: 0.20.0
-  category: main
-  manager: conda
-  dependencies:
-  - python >=3.12,<3.13.0a0
-  - python >=3.12,<3.13.0a0 *_cpython
-  - python_abi 3.12.* *_cp312
-  url: https://conda.anaconda.org/conda-forge/osx-arm64/pyrsistent-0.20.0-py312he37b823_0.conda
-  hash:
-    md5: 453b7bdd7de542954a220dbc97feb7f7
-    sha256: 2d7ec60072a9348540c0de552f5b23310326c4708d685a594e74bc4aac6cce34
-  build: py312he37b823_0
-  arch: aarch64
-  subdir: osx-arm64
-  build_number: 0
-  license: MIT
-  license_family: MIT
-  size: 119500
-  timestamp: 1698754330559
-- platform: win-64
-  name: pyrsistent
-  version: 0.20.0
-  category: main
-  manager: conda
-  dependencies:
-  - python >=3.12,<3.13.0a0
-  - python_abi 3.12.* *_cp312
-  - ucrt >=10.0.20348.0
-  - vc >=14.2,<15
-  - vc14_runtime >=14.29.30139
-  url: https://conda.anaconda.org/conda-forge/win-64/pyrsistent-0.20.0-py312he70551f_0.conda
-  hash:
-    md5: 9ee63772f931f505d4d54a6656a96db8
-    sha256: 02f41fadf10e4d725991e56375ae92172ae915f7d6329f865cf4edac6f6618de
-  build: py312he70551f_0
-  arch: x86_64
-  subdir: win-64
-  build_number: 0
-  license: MIT
-  license_family: MIT
-  size: 114503
-  timestamp: 1698754544996
 - platform: linux-64
   name: pysnooper
   version: 1.2.0
@@ -25640,17 +25823,17 @@ package:
   timestamp: 1684965001294
 - platform: linux-64
   name: pytest-xdist
-  version: 3.3.1
+  version: 3.4.0
   category: main
   manager: conda
   dependencies:
   - execnet >=1.1
   - pytest >=6.2.0
   - python >=3.7
-  url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.3.1-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.4.0-pyhd8ed1ab_0.conda
   hash:
-    md5: 816073bb54ef59f33f0f26c14f88311b
-    sha256: 5df2d0f1e42041476cbdf12b808890d668e7f0272b51f0f3fa7aab84732150b6
+    md5: b8dc6f9db1b9670e564b68277a79ffeb
+    sha256: b835170885a0d2b4bfdc7bc5d09e5a175518f41b6ffa1a0ac891797cd94e3292
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: linux-64
@@ -25660,21 +25843,21 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 36169
-  timestamp: 1684499962909
+  size: 36371
+  timestamp: 1699728992127
 - platform: osx-64
   name: pytest-xdist
-  version: 3.3.1
+  version: 3.4.0
   category: main
   manager: conda
   dependencies:
   - execnet >=1.1
   - pytest >=6.2.0
   - python >=3.7
-  url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.3.1-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.4.0-pyhd8ed1ab_0.conda
   hash:
-    md5: 816073bb54ef59f33f0f26c14f88311b
-    sha256: 5df2d0f1e42041476cbdf12b808890d668e7f0272b51f0f3fa7aab84732150b6
+    md5: b8dc6f9db1b9670e564b68277a79ffeb
+    sha256: b835170885a0d2b4bfdc7bc5d09e5a175518f41b6ffa1a0ac891797cd94e3292
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: osx-64
@@ -25684,21 +25867,21 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 36169
-  timestamp: 1684499962909
+  size: 36371
+  timestamp: 1699728992127
 - platform: osx-arm64
   name: pytest-xdist
-  version: 3.3.1
+  version: 3.4.0
   category: main
   manager: conda
   dependencies:
   - execnet >=1.1
   - pytest >=6.2.0
   - python >=3.7
-  url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.3.1-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.4.0-pyhd8ed1ab_0.conda
   hash:
-    md5: 816073bb54ef59f33f0f26c14f88311b
-    sha256: 5df2d0f1e42041476cbdf12b808890d668e7f0272b51f0f3fa7aab84732150b6
+    md5: b8dc6f9db1b9670e564b68277a79ffeb
+    sha256: b835170885a0d2b4bfdc7bc5d09e5a175518f41b6ffa1a0ac891797cd94e3292
   build: pyhd8ed1ab_0
   arch: aarch64
   subdir: osx-arm64
@@ -25708,21 +25891,21 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 36169
-  timestamp: 1684499962909
+  size: 36371
+  timestamp: 1699728992127
 - platform: win-64
   name: pytest-xdist
-  version: 3.3.1
+  version: 3.4.0
   category: main
   manager: conda
   dependencies:
   - execnet >=1.1
   - pytest >=6.2.0
   - python >=3.7
-  url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.3.1-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.4.0-pyhd8ed1ab_0.conda
   hash:
-    md5: 816073bb54ef59f33f0f26c14f88311b
-    sha256: 5df2d0f1e42041476cbdf12b808890d668e7f0272b51f0f3fa7aab84732150b6
+    md5: b8dc6f9db1b9670e564b68277a79ffeb
+    sha256: b835170885a0d2b4bfdc7bc5d09e5a175518f41b6ffa1a0ac891797cd94e3292
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: win-64
@@ -25732,8 +25915,8 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 36169
-  timestamp: 1684499962909
+  size: 36371
+  timestamp: 1699728992127
 - platform: linux-64
   name: python
   version: 3.12.0
@@ -27132,6 +27315,94 @@ package:
   noarch: python
   size: 17373
   timestamp: 1694242843889
+- platform: linux-64
+  name: referencing
+  version: 0.30.2
+  category: main
+  manager: conda
+  dependencies:
+  - attrs >=22.2.0
+  - python >=3.8
+  - rpds-py >=0.7.0
+  url: https://conda.anaconda.org/conda-forge/noarch/referencing-0.30.2-pyhd8ed1ab_0.conda
+  hash:
+    md5: a33161b983172ba6ef69d5fc850650cd
+    sha256: a6768fabc12f1eed87fec68c5c65439e908655cded1e458d70a164abbce13287
+  build: pyhd8ed1ab_0
+  arch: x86_64
+  subdir: linux-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 38061
+  timestamp: 1691337409918
+- platform: osx-64
+  name: referencing
+  version: 0.30.2
+  category: main
+  manager: conda
+  dependencies:
+  - attrs >=22.2.0
+  - python >=3.8
+  - rpds-py >=0.7.0
+  url: https://conda.anaconda.org/conda-forge/noarch/referencing-0.30.2-pyhd8ed1ab_0.conda
+  hash:
+    md5: a33161b983172ba6ef69d5fc850650cd
+    sha256: a6768fabc12f1eed87fec68c5c65439e908655cded1e458d70a164abbce13287
+  build: pyhd8ed1ab_0
+  arch: x86_64
+  subdir: osx-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 38061
+  timestamp: 1691337409918
+- platform: osx-arm64
+  name: referencing
+  version: 0.30.2
+  category: main
+  manager: conda
+  dependencies:
+  - attrs >=22.2.0
+  - python >=3.8
+  - rpds-py >=0.7.0
+  url: https://conda.anaconda.org/conda-forge/noarch/referencing-0.30.2-pyhd8ed1ab_0.conda
+  hash:
+    md5: a33161b983172ba6ef69d5fc850650cd
+    sha256: a6768fabc12f1eed87fec68c5c65439e908655cded1e458d70a164abbce13287
+  build: pyhd8ed1ab_0
+  arch: aarch64
+  subdir: osx-arm64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 38061
+  timestamp: 1691337409918
+- platform: win-64
+  name: referencing
+  version: 0.30.2
+  category: main
+  manager: conda
+  dependencies:
+  - attrs >=22.2.0
+  - python >=3.8
+  - rpds-py >=0.7.0
+  url: https://conda.anaconda.org/conda-forge/noarch/referencing-0.30.2-pyhd8ed1ab_0.conda
+  hash:
+    md5: a33161b983172ba6ef69d5fc850650cd
+    sha256: a6768fabc12f1eed87fec68c5c65439e908655cded1e458d70a164abbce13287
+  build: pyhd8ed1ab_0
+  arch: x86_64
+  subdir: win-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  noarch: python
+  size: 38061
+  timestamp: 1691337409918
 - platform: linux-64
   name: requests
   version: 2.31.0
@@ -27656,6 +27927,91 @@ package:
   noarch: python
   size: 183200
   timestamp: 1696096819794
+- platform: linux-64
+  name: rpds-py
+  version: 0.12.0
+  category: main
+  manager: conda
+  dependencies:
+  - libgcc-ng >=12
+  - python >=3.12,<3.13.0a0
+  - python_abi 3.12.* *_cp312
+  url: https://conda.anaconda.org/conda-forge/linux-64/rpds-py-0.12.0-py312h4b3b743_0.conda
+  hash:
+    md5: 19e0573a4833ddeb1f2c6f0bef6bc8d2
+    sha256: 8a004f54e0ae64d951e20297ca9e3461b5c2384970d88381c63c34413c7cb2af
+  build: py312h4b3b743_0
+  arch: x86_64
+  subdir: linux-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  size: 985109
+  timestamp: 1699110027579
+- platform: osx-64
+  name: rpds-py
+  version: 0.12.0
+  category: main
+  manager: conda
+  dependencies:
+  - python >=3.12,<3.13.0a0
+  - python_abi 3.12.* *_cp312
+  url: https://conda.anaconda.org/conda-forge/osx-64/rpds-py-0.12.0-py312h6e28e45_0.conda
+  hash:
+    md5: 83eeae532de3a7782e9044609f6cfdc3
+    sha256: f1e2462d507ee8a1d1b13be0f1736fdfd012c153a48c2779fed844b9386d38c1
+  build: py312h6e28e45_0
+  arch: x86_64
+  subdir: osx-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  size: 282267
+  timestamp: 1699110250813
+- platform: osx-arm64
+  name: rpds-py
+  version: 0.12.0
+  category: main
+  manager: conda
+  dependencies:
+  - python >=3.12,<3.13.0a0
+  - python >=3.12,<3.13.0a0 *_cpython
+  - python_abi 3.12.* *_cp312
+  url: https://conda.anaconda.org/conda-forge/osx-arm64/rpds-py-0.12.0-py312h5280bc4_0.conda
+  hash:
+    md5: 6d168f73909a3236400d55d69e6432e7
+    sha256: e90ba357c8b3ea8c2da4c158b198e2de0440d8b212553c8af808f016d48ca56a
+  build: py312h5280bc4_0
+  arch: aarch64
+  subdir: osx-arm64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  size: 281057
+  timestamp: 1699110351749
+- platform: win-64
+  name: rpds-py
+  version: 0.12.0
+  category: main
+  manager: conda
+  dependencies:
+  - python >=3.12,<3.13.0a0
+  - python_abi 3.12.* *_cp312
+  - ucrt >=10.0.20348.0
+  - vc >=14.2,<15
+  - vc14_runtime >=14.29.30139
+  url: https://conda.anaconda.org/conda-forge/win-64/rpds-py-0.12.0-py312hfccd98a_0.conda
+  hash:
+    md5: 988e246be3583aaf22b34d4155c5b676
+    sha256: c48867e31bbc56c4e75ef8b8d8a4733c59dc0e5c85572f861ab65875168872bc
+  build: py312hfccd98a_0
+  arch: x86_64
+  subdir: win-64
+  build_number: 0
+  license: MIT
+  license_family: MIT
+  size: 180234
+  timestamp: 1699110849265
 - platform: linux-64
   name: rtree
   version: 1.1.0
@@ -29360,96 +29716,96 @@ package:
   timestamp: 1697713986066
 - platform: linux-64
   name: terminado
-  version: 0.17.1
+  version: 0.18.0
   category: main
   manager: conda
   dependencies:
   - __linux
   - ptyprocess
-  - python >=3.7
+  - python >=3.8
   - tornado >=6.1.0
-  url: https://conda.anaconda.org/conda-forge/noarch/terminado-0.17.1-pyh41d4057_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/terminado-0.18.0-pyh0d859eb_0.conda
   hash:
-    md5: 3788984d535770cad699efaeb6cb3037
-    sha256: bce252eb53330a8ba9617caa7a1dc75ce602c8808cf547a8f4d48285901f47c3
-  build: pyh41d4057_0
+    md5: e463f348b8b0eb62c9f7c6fbc780286c
+    sha256: e90139ef15ea9d75a69cd6b6302c29ed5b01c03ddfa717b71acb32b60af74269
+  build: pyh0d859eb_0
   arch: x86_64
   subdir: linux-64
   build_number: 0
   license: BSD-2-Clause
   license_family: BSD
   noarch: python
-  size: 20787
-  timestamp: 1670253786972
+  size: 22369
+  timestamp: 1699810283724
 - platform: osx-64
   name: terminado
-  version: 0.17.1
+  version: 0.18.0
   category: main
   manager: conda
   dependencies:
   - __osx
   - ptyprocess
-  - python >=3.7
+  - python >=3.8
   - tornado >=6.1.0
-  url: https://conda.anaconda.org/conda-forge/noarch/terminado-0.17.1-pyhd1c38e8_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/terminado-0.18.0-pyh31c8845_0.conda
   hash:
-    md5: 046120b71d8896cb7faef78bfdbfee1e
-    sha256: a2f8382ab390c74af592cc3566dc22e2ed81e5ac69c5b6417d1b7c22e63927bc
-  build: pyhd1c38e8_0
+    md5: 14759b57f5b9d97033e633fff0a2d27e
+    sha256: 8e8741c688ade9be8f86c0b209780c7fbe4a97e4265311ca9d8dda5fcedc6a28
+  build: pyh31c8845_0
   arch: x86_64
   subdir: osx-64
   build_number: 0
   license: BSD-2-Clause
   license_family: BSD
   noarch: python
-  size: 20347
-  timestamp: 1670254383751
+  size: 22631
+  timestamp: 1699810378589
 - platform: osx-arm64
   name: terminado
-  version: 0.17.1
+  version: 0.18.0
   category: main
   manager: conda
   dependencies:
   - __osx
   - ptyprocess
-  - python >=3.7
+  - python >=3.8
   - tornado >=6.1.0
-  url: https://conda.anaconda.org/conda-forge/noarch/terminado-0.17.1-pyhd1c38e8_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/terminado-0.18.0-pyh31c8845_0.conda
   hash:
-    md5: 046120b71d8896cb7faef78bfdbfee1e
-    sha256: a2f8382ab390c74af592cc3566dc22e2ed81e5ac69c5b6417d1b7c22e63927bc
-  build: pyhd1c38e8_0
+    md5: 14759b57f5b9d97033e633fff0a2d27e
+    sha256: 8e8741c688ade9be8f86c0b209780c7fbe4a97e4265311ca9d8dda5fcedc6a28
+  build: pyh31c8845_0
   arch: aarch64
   subdir: osx-arm64
   build_number: 0
   license: BSD-2-Clause
   license_family: BSD
   noarch: python
-  size: 20347
-  timestamp: 1670254383751
+  size: 22631
+  timestamp: 1699810378589
 - platform: win-64
   name: terminado
-  version: 0.17.0
+  version: 0.18.0
   category: main
   manager: conda
   dependencies:
   - __win
-  - python >=3.7
+  - python >=3.8
   - pywinpty >=1.1.0
   - tornado >=6.1.0
-  url: https://conda.anaconda.org/conda-forge/noarch/terminado-0.17.0-pyh08f2357_0.tar.bz2
+  url: https://conda.anaconda.org/conda-forge/noarch/terminado-0.18.0-pyh5737063_0.conda
   hash:
-    md5: 0152a609d5748ed9887d195b1e61a6c9
-    sha256: 5c8fcf31430e0f312bc65ab5aa5b893fcc250820c023b02ff3fd188ae13199a5
-  build: pyh08f2357_0
+    md5: f2fc93bc1e08e04612c4d19361bb0011
+    sha256: 4353d8d2372ad050cbdab05890c057356ea8693ecfb959396ebb8ffdfc1948bf
+  build: pyh5737063_0
   arch: x86_64
   subdir: win-64
   build_number: 0
   license: BSD-2-Clause
   license_family: BSD
   noarch: python
-  size: 19530
-  timestamp: 1666708102607
+  size: 22855
+  timestamp: 1699810439015
 - platform: linux-64
   name: threadpoolctl
   version: 3.2.0
@@ -31333,17 +31689,17 @@ package:
   timestamp: 1677713151746
 - platform: linux-64
   name: urllib3
-  version: 2.0.7
+  version: 2.1.0
   category: main
   manager: conda
   dependencies:
   - brotli-python >=1.0.9
   - pysocks >=1.5.6,<2.0,!=1.5.7
   - python >=3.7
-  url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.7-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.1.0-pyhd8ed1ab_0.conda
   hash:
-    md5: 270e71c14d37074b1d066ee21cf0c4a6
-    sha256: 9fe14735dde74278c6f1710cbe883d5710fc98501a96031dec6849a8d8a1bb11
+    md5: f8ced8ee63830dec7ecc1be048d1470a
+    sha256: eff5029820b4eaeab3a291a39854a6cd8fc8c4216264087f68c2d8d59822c869
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: linux-64
@@ -31351,21 +31707,21 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 98507
-  timestamp: 1697720586316
+  size: 85324
+  timestamp: 1699933655057
 - platform: osx-64
   name: urllib3
-  version: 2.0.7
+  version: 2.1.0
   category: main
   manager: conda
   dependencies:
   - brotli-python >=1.0.9
   - pysocks >=1.5.6,<2.0,!=1.5.7
   - python >=3.7
-  url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.7-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.1.0-pyhd8ed1ab_0.conda
   hash:
-    md5: 270e71c14d37074b1d066ee21cf0c4a6
-    sha256: 9fe14735dde74278c6f1710cbe883d5710fc98501a96031dec6849a8d8a1bb11
+    md5: f8ced8ee63830dec7ecc1be048d1470a
+    sha256: eff5029820b4eaeab3a291a39854a6cd8fc8c4216264087f68c2d8d59822c869
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: osx-64
@@ -31373,21 +31729,21 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 98507
-  timestamp: 1697720586316
+  size: 85324
+  timestamp: 1699933655057
 - platform: osx-arm64
   name: urllib3
-  version: 2.0.7
+  version: 2.1.0
   category: main
   manager: conda
   dependencies:
   - brotli-python >=1.0.9
   - pysocks >=1.5.6,<2.0,!=1.5.7
   - python >=3.7
-  url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.7-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.1.0-pyhd8ed1ab_0.conda
   hash:
-    md5: 270e71c14d37074b1d066ee21cf0c4a6
-    sha256: 9fe14735dde74278c6f1710cbe883d5710fc98501a96031dec6849a8d8a1bb11
+    md5: f8ced8ee63830dec7ecc1be048d1470a
+    sha256: eff5029820b4eaeab3a291a39854a6cd8fc8c4216264087f68c2d8d59822c869
   build: pyhd8ed1ab_0
   arch: aarch64
   subdir: osx-arm64
@@ -31395,21 +31751,21 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 98507
-  timestamp: 1697720586316
+  size: 85324
+  timestamp: 1699933655057
 - platform: win-64
   name: urllib3
-  version: 2.0.7
+  version: 2.1.0
   category: main
   manager: conda
   dependencies:
   - brotli-python >=1.0.9
   - pysocks >=1.5.6,<2.0,!=1.5.7
   - python >=3.7
-  url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.7-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.1.0-pyhd8ed1ab_0.conda
   hash:
-    md5: 270e71c14d37074b1d066ee21cf0c4a6
-    sha256: 9fe14735dde74278c6f1710cbe883d5710fc98501a96031dec6849a8d8a1bb11
+    md5: f8ced8ee63830dec7ecc1be048d1470a
+    sha256: eff5029820b4eaeab3a291a39854a6cd8fc8c4216264087f68c2d8d59822c869
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: win-64
@@ -31417,8 +31773,8 @@ package:
   license: MIT
   license_family: MIT
   noarch: python
-  size: 98507
-  timestamp: 1697720586316
+  size: 85324
+  timestamp: 1699933655057
 - platform: win-64
   name: vc
   version: '14.3'
@@ -31658,88 +32014,84 @@ package:
   timestamp: 1695395846556
 - platform: linux-64
   name: wcwidth
-  version: 0.2.9
+  version: 0.2.10
   category: main
   manager: conda
   dependencies:
   - backports.functools_lru_cache
   - python >=3.6
-  url: https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.9-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.10-pyhd8ed1ab_0.conda
   hash:
-    md5: 8e8280dec091763dfdc29e066de52270
-    sha256: 7552f6545ed212b9ae5d023870481fc377c7f18b4854b63160699b95a420c42e
+    md5: 48978e4e99db7d1ee0d277f6dee20684
+    sha256: e988673c05416073d0e776bac223b6c79fb5cc1207291c6c6f9e238624a135c0
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: linux-64
   build_number: 0
   license: MIT
-  license_family: MIT
   noarch: python
-  size: 30316
-  timestamp: 1698744892384
+  size: 32557
+  timestamp: 1699959343164
 - platform: osx-64
   name: wcwidth
-  version: 0.2.9
+  version: 0.2.10
   category: main
   manager: conda
   dependencies:
   - backports.functools_lru_cache
   - python >=3.6
-  url: https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.9-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.10-pyhd8ed1ab_0.conda
   hash:
-    md5: 8e8280dec091763dfdc29e066de52270
-    sha256: 7552f6545ed212b9ae5d023870481fc377c7f18b4854b63160699b95a420c42e
+    md5: 48978e4e99db7d1ee0d277f6dee20684
+    sha256: e988673c05416073d0e776bac223b6c79fb5cc1207291c6c6f9e238624a135c0
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: osx-64
   build_number: 0
   license: MIT
-  license_family: MIT
   noarch: python
-  size: 30316
-  timestamp: 1698744892384
+  size: 32557
+  timestamp: 1699959343164
 - platform: osx-arm64
   name: wcwidth
-  version: 0.2.9
+  version: 0.2.10
   category: main
   manager: conda
   dependencies:
   - backports.functools_lru_cache
   - python >=3.6
-  url: https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.9-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.10-pyhd8ed1ab_0.conda
   hash:
-    md5: 8e8280dec091763dfdc29e066de52270
-    sha256: 7552f6545ed212b9ae5d023870481fc377c7f18b4854b63160699b95a420c42e
+    md5: 48978e4e99db7d1ee0d277f6dee20684
+    sha256: e988673c05416073d0e776bac223b6c79fb5cc1207291c6c6f9e238624a135c0
   build: pyhd8ed1ab_0
   arch: aarch64
   subdir: osx-arm64
   build_number: 0
   license: MIT
-  license_family: MIT
   noarch: python
-  size: 30316
-  timestamp: 1698744892384
+  size: 32557
+  timestamp: 1699959343164
 - platform: win-64
   name: wcwidth
-  version: 0.2.9
+  version: 0.2.10
   category: main
   manager: conda
   dependencies:
   - backports.functools_lru_cache
   - python >=3.6
-  url: https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.9-pyhd8ed1ab_0.conda
+  url: https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.10-pyhd8ed1ab_0.conda
   hash:
-    md5: 8e8280dec091763dfdc29e066de52270
-    sha256: 7552f6545ed212b9ae5d023870481fc377c7f18b4854b63160699b95a420c42e
+    md5: 48978e4e99db7d1ee0d277f6dee20684
+    sha256: e988673c05416073d0e776bac223b6c79fb5cc1207291c6c6f9e238624a135c0
   build: pyhd8ed1ab_0
   arch: x86_64
   subdir: win-64
   build_number: 0
   license: MIT
-  license_family: MIT
   noarch: python
-  size: 30316
-  timestamp: 1698744892384
+  size: 32557
+  timestamp: 1699959343164
 - platform: linux-64
   name: webcolors
   version: '1.13'
@@ -32115,6 +32467,7 @@ package:
   subdir: linux-64
   build_number: 0
   license: BSD-2-Clause
+  license_family: BSD
   size: 62482
   timestamp: 1699532968076
 - platform: osx-64
@@ -32134,6 +32487,7 @@ package:
   subdir: osx-64
   build_number: 0
   license: BSD-2-Clause
+  license_family: BSD
   size: 59057
   timestamp: 1699533259706
 - platform: osx-arm64
@@ -32154,6 +32508,7 @@ package:
   subdir: osx-arm64
   build_number: 0
   license: BSD-2-Clause
+  license_family: BSD
   size: 59676
   timestamp: 1699533197501
 - platform: win-64
@@ -32176,6 +32531,7 @@ package:
   subdir: win-64
   build_number: 0
   license: BSD-2-Clause
+  license_family: BSD
   size: 61358
   timestamp: 1699533495284
 - platform: linux-64
@@ -33548,4 +33904,3 @@ package:
   license_family: BSD
   size: 343428
   timestamp: 1693151615801
-version: 1
diff --git a/pixi.toml b/pixi.toml
index 00b7aeb23..9bb58c2e5 100644
--- a/pixi.toml
+++ b/pixi.toml
@@ -77,9 +77,7 @@ tests = { depends_on = ["lint", "test-ribasim-python", "test-ribasim-core"] }
 generate-schema = { cmd = "julia --project=docs docs/gen_schema.jl", depends_on = [
     "instantiate-julia",
 ] }
-generate-python = """\
-    datamodel-codegen --use-title-as-name --use-double-quotes --disable-timestamp --use-default --strict-nullable --input-file-type=jsonschema --input docs/schema/root.schema.json --output python/ribasim/ribasim/models.py && \
-    datamodel-codegen --use-title-as-name --use-double-quotes --disable-timestamp --use-default --strict-nullable --input-file-type=jsonschema --input docs/schema/Config.schema.json --output python/ribasim/ribasim/config.py"""
+generate-python = "datamodel-codegen --output-model-type pydantic_v2.BaseModel --base-class ribasim.input_base.BaseModel --use-union-operator --use-title-as-name --use-double-quotes --disable-timestamp --use-default --strict-nullable --input-file-type=jsonschema --input docs/schema/root.schema.json --output python/ribasim/ribasim/models.py"
 codegen = { depends_on = ["generate-schema", "generate-python", "lint"] }
 # Publish
 build-ribasim-python-wheel = { cmd = "rm --recursive --force dist && python -m build && twine check dist/*", cwd = "python/ribasim" }
@@ -108,12 +106,12 @@ pandera = "*"
 pip = "*"
 pre-commit = "*"
 pyarrow = "*"
-pydantic = "~=1.0"
+pydantic = ">=2"
 pyogrio = "*"
 pytest = "*"
 pytest-cov = "*"
 pytest-xdist = "*"
-python = ">=3.9"
+python = ">=3.10"
 quartodoc = "*"
 ruff = "*"
 shapely = ">=2.0"
diff --git a/python/ribasim/pyproject.toml b/python/ribasim/pyproject.toml
index 1a7286ae4..39413f09b 100644
--- a/python/ribasim/pyproject.toml
+++ b/python/ribasim/pyproject.toml
@@ -12,14 +12,14 @@ classifiers = [
     "Intended Audience :: Science/Research",
     "Topic :: Scientific/Engineering :: Hydrology",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
     "geopandas",
     "matplotlib",
     "pandas",
     "pandera != 0.16.0",
     "pyarrow",
-    "pydantic ~= 1.0",
+    "pydantic ~= 2.0",
     "pyogrio",
     "shapely >= 2.0",
     "tomli",
diff --git a/python/ribasim/ribasim/__init__.py b/python/ribasim/ribasim/__init__.py
index fa164971e..097f03a7d 100644
--- a/python/ribasim/ribasim/__init__.py
+++ b/python/ribasim/ribasim/__init__.py
@@ -2,45 +2,57 @@
 
 
 from ribasim import models, utils
-from ribasim.config import Allocation, Config, Logging, Solver
-from ribasim.geometry.edge import Edge
-from ribasim.geometry.node import Node
-from ribasim.model import Model
-from ribasim.node_types.basin import Basin
-from ribasim.node_types.discrete_control import DiscreteControl
-from ribasim.node_types.flow_boundary import FlowBoundary
-from ribasim.node_types.fractional_flow import FractionalFlow
-from ribasim.node_types.level_boundary import LevelBoundary
-from ribasim.node_types.linear_resistance import LinearResistance
-from ribasim.node_types.manning_resistance import ManningResistance
-from ribasim.node_types.outlet import Outlet
-from ribasim.node_types.pid_control import PidControl
-from ribasim.node_types.pump import Pump
-from ribasim.node_types.tabulated_rating_curve import TabulatedRatingCurve
-from ribasim.node_types.terminal import Terminal
-from ribasim.node_types.user import User
+from ribasim.config import (
+    Allocation,
+    Basin,
+    Compression,
+    DiscreteControl,
+    FlowBoundary,
+    FractionalFlow,
+    LevelBoundary,
+    LinearResistance,
+    Logging,
+    ManningResistance,
+    Outlet,
+    PidControl,
+    Pump,
+    Results,
+    Solver,
+    TabulatedRatingCurve,
+    Terminal,
+    User,
+    Verbosity,
+)
+from ribasim.geometry.edge import Edge, EdgeSchema
+from ribasim.geometry.node import Node, NodeSchema
+from ribasim.model import Model, Network
 
 __all__ = [
-    "models",
-    "utils",
-    "Config",
+    "Allocation",
     "Basin",
+    "DiscreteControl",
+    "Compression",
     "Edge",
+    "EdgeSchema",
+    "FlowBoundary",
     "FractionalFlow",
+    "Results",
     "LevelBoundary",
     "LinearResistance",
+    "Logging",
     "ManningResistance",
     "Model",
+    "models",
+    "Network",
     "Node",
-    "Pump",
+    "NodeSchema",
     "Outlet",
-    "FlowBoundary",
+    "PidControl",
+    "Pump",
     "Solver",
-    "Logging",
     "TabulatedRatingCurve",
+    "Verbosity",
     "Terminal",
-    "DiscreteControl",
-    "PidControl",
     "User",
-    "Allocation",
+    "utils",
 ]
diff --git a/python/ribasim/ribasim/config.py b/python/ribasim/ribasim/config.py
index 553e4c340..6a4330699 100644
--- a/python/ribasim/ribasim/config.py
+++ b/python/ribasim/ribasim/config.py
@@ -1,26 +1,63 @@
-# generated by datamodel-codegen:
-#   filename:  Config.schema.json
+from enum import Enum
+from pathlib import Path
+
+from pydantic import Field
+
+from ribasim.input_base import BaseModel, NodeModel, TableModel
+
+# These schemas are autogenerated
+from ribasim.schemas import (  # type: ignore
+    BasinProfileSchema,
+    BasinStateSchema,
+    BasinStaticSchema,
+    BasinTimeSchema,
+    DiscreteControlConditionSchema,
+    DiscreteControlLogicSchema,
+    FlowBoundaryStaticSchema,
+    FlowBoundaryTimeSchema,
+    FractionalFlowStaticSchema,
+    LevelBoundaryStaticSchema,
+    LevelBoundaryTimeSchema,
+    LinearResistanceStaticSchema,
+    ManningResistanceStaticSchema,
+    OutletStaticSchema,
+    PidControlStaticSchema,
+    PidControlTimeSchema,
+    PumpStaticSchema,
+    TabulatedRatingCurveStaticSchema,
+    TabulatedRatingCurveTimeSchema,
+    TerminalStaticSchema,
+    UserStaticSchema,
+    UserTimeSchema,
+)
 
-from __future__ import annotations
 
-from datetime import datetime
-from typing import List, Optional, Union
+class Allocation(BaseModel):
+    timestep: float | None = None
+    use_allocation: bool = False
 
-from pydantic import BaseModel, Field
 
+class Compression(str, Enum):
+    zstd = "zstd"
+    lz4 = "lz4"
 
-class Allocation(BaseModel):
-    timestep: Optional[float] = None
-    use_allocation: bool = False
+
+class Results(BaseModel):
+    basin: Path = Path("results/basin.arrow")
+    flow: Path = Path("results/flow.arrow")
+    control: Path = Path("results/control.arrow")
+    outstate: str | None = None
+    compression: Compression = Compression.zstd
+    compression_level: int = 6
 
 
 class Solver(BaseModel):
     algorithm: str = "QNDF"
-    saveat: Union[float, List[float]] = []
+    saveat: float | list[float] = []
     adaptive: bool = True
-    dt: Optional[float] = None
-    dtmin: Optional[float] = None
-    dtmax: Optional[float] = None
+    dt: float | None = None
+    dtmin: float | None = None
+    dtmax: float | None = None
     force_dtmin: bool = False
     abstol: float = 1e-06
     reltol: float = 1e-05
@@ -29,168 +66,136 @@ class Solver(BaseModel):
     autodiff: bool = True
 
 
+class Verbosity(str, Enum):
+    debug = "debug"
+    info = "info"
+    warn = "warn"
+    error = "error"
+
+
 class Logging(BaseModel):
-    verbosity: str = "info"
+    verbosity: Verbosity = Verbosity.info
     timing: bool = False
 
 
-class Results(BaseModel):
-    basin: str = "results/basin.arrow"
-    flow: str = "results/flow.arrow"
-    control: str = "results/control.arrow"
-    allocation: str = "results/allocation.arrow"
-    outstate: Optional[str] = None
-    compression: str = "zstd"
-    compression_level: int = 6
-
+class Terminal(NodeModel):
+    static: TableModel[TerminalStaticSchema] = Field(
+        default_factory=TableModel[TerminalStaticSchema]
+    )
 
-class Terminal(BaseModel):
-    static: Optional[str] = None
 
+class PidControl(NodeModel):
+    static: TableModel[PidControlStaticSchema] = Field(
+        default_factory=TableModel[PidControlStaticSchema]
+    )
+    time: TableModel[PidControlTimeSchema] = Field(
+        default_factory=TableModel[PidControlTimeSchema]
+    )
 
-class PidControl(BaseModel):
-    static: Optional[str] = None
-    time: Optional[str] = None
+    _sort_keys: dict[str, list[str]] = {"time": ["time", "node_id"]}
 
 
-class LevelBoundary(BaseModel):
-    static: Optional[str] = None
-    time: Optional[str] = None
+class LevelBoundary(NodeModel):
+    static: TableModel[LevelBoundaryStaticSchema] = Field(
+        default_factory=TableModel[LevelBoundaryStaticSchema]
+    )
+    time: TableModel[LevelBoundaryTimeSchema] = Field(
+        default_factory=TableModel[LevelBoundaryTimeSchema]
+    )
 
+    _sort_keys: dict[str, list[str]] = {"time": ["time", "node_id"]}
 
-class Pump(BaseModel):
-    static: Optional[str] = None
 
+class Pump(NodeModel):
+    static: TableModel[PumpStaticSchema] = Field(
+        default_factory=TableModel[PumpStaticSchema]
+    )
 
-class TabulatedRatingCurve(BaseModel):
-    static: Optional[str] = None
-    time: Optional[str] = None
 
+class TabulatedRatingCurve(NodeModel):
+    static: TableModel[TabulatedRatingCurveStaticSchema] = Field(
+        default_factory=TableModel[TabulatedRatingCurveStaticSchema]
+    )
+    time: TableModel[TabulatedRatingCurveTimeSchema] = Field(
+        default_factory=TableModel[TabulatedRatingCurveTimeSchema]
+    )
+    _sort_keys: dict[str, list[str]] = {
+        "static": ["node_id", "level"],
+        "time": ["time", "node_id", "level"],
+    }
 
-class User(BaseModel):
-    static: Optional[str] = None
-    time: Optional[str] = None
 
+class User(NodeModel):
+    static: TableModel[UserStaticSchema] = Field(
+        default_factory=TableModel[UserStaticSchema]
+    )
+    time: TableModel[UserTimeSchema] = Field(default_factory=TableModel[UserTimeSchema])
 
-class FlowBoundary(BaseModel):
-    static: Optional[str] = None
-    time: Optional[str] = None
+    _sort_keys: dict[str, list[str]] = {
+        "static": ["node_id", "priority"],
+        "time": ["node_id", "priority", "time"],
+    }
 
 
-class Basin(BaseModel):
-    profile: Optional[str] = None
-    state: Optional[str] = None
-    static: Optional[str] = None
-    time: Optional[str] = None
+class FlowBoundary(NodeModel):
+    static: TableModel[FlowBoundaryStaticSchema] = Field(
+        default_factory=TableModel[FlowBoundaryStaticSchema]
+    )
+    time: TableModel[FlowBoundaryTimeSchema] = Field(
+        default_factory=TableModel[FlowBoundaryTimeSchema]
+    )
 
+    _sort_keys: dict[str, list[str]] = {"time": ["time", "node_id"]}
 
-class ManningResistance(BaseModel):
-    static: Optional[str] = None
 
+class Basin(NodeModel):
+    profile: TableModel[BasinProfileSchema] = Field(
+        default_factory=TableModel[BasinProfileSchema]
+    )
+    state: TableModel[BasinStateSchema] = Field(
+        default_factory=TableModel[BasinStateSchema]
+    )
+    static: TableModel[BasinStaticSchema] = Field(
+        default_factory=TableModel[BasinStaticSchema]
+    )
+    time: TableModel[BasinTimeSchema] = Field(
+        default_factory=TableModel[BasinTimeSchema]
+    )
 
-class DiscreteControl(BaseModel):
-    condition: Optional[str] = None
-    logic: Optional[str] = None
+    _sort_keys: dict[str, list[str]] = {
+        "profile": ["node_id", "level"],
+        "time": ["time", "node_id"],
+    }
 
 
-class Outlet(BaseModel):
-    static: Optional[str] = None
+class ManningResistance(NodeModel):
+    static: TableModel[ManningResistanceStaticSchema] = Field(
+        default_factory=TableModel[ManningResistanceStaticSchema]
+    )
 
 
-class LinearResistance(BaseModel):
-    static: Optional[str] = None
+class DiscreteControl(NodeModel):
+    condition: TableModel[DiscreteControlConditionSchema] = Field(
+        default_factory=TableModel[DiscreteControlConditionSchema]
+    )
+    logic: TableModel[DiscreteControlLogicSchema] = Field(
+        default_factory=TableModel[DiscreteControlLogicSchema]
+    )
 
 
-class FractionalFlow(BaseModel):
-    static: Optional[str] = None
+class Outlet(NodeModel):
+    static: TableModel[OutletStaticSchema] = Field(
+        default_factory=TableModel[OutletStaticSchema]
+    )
 
 
-class Config(BaseModel):
-    starttime: datetime
-    endtime: datetime
-    relative_dir: str = "."
-    input_dir: str = "."
-    results_dir: str = "."
-    database: str
-    allocation: Allocation = Field(
-        default_factory=lambda: Allocation.parse_obj(
-            {"timestep": None, "use_allocation": False}
-        )
-    )
-    solver: Solver = Field(
-        default_factory=lambda: Solver.parse_obj(
-            {
-                "algorithm": "QNDF",
-                "saveat": [],
-                "adaptive": True,
-                "dt": None,
-                "dtmin": None,
-                "dtmax": None,
-                "force_dtmin": False,
-                "abstol": 1e-06,
-                "reltol": 1e-05,
-                "maxiters": 1000000000,
-                "sparse": True,
-                "autodiff": True,
-            }
-        )
-    )
-    logging: Logging = Field(
-        default_factory=lambda: Logging.parse_obj(
-            {"verbosity": {"level": 0}, "timing": False}
-        )
-    )
-    results: Results = Field(
-        default_factory=lambda: Results.parse_obj(
-            {
-                "basin": "results/basin.arrow",
-                "flow": "results/flow.arrow",
-                "control": "results/control.arrow",
-                "allocation": "results/allocation.arrow",
-                "outstate": None,
-                "compression": "zstd",
-                "compression_level": 6,
-            }
-        )
-    )
-    terminal: Terminal = Field(
-        default_factory=lambda: Terminal.parse_obj({"static": None})
+class LinearResistance(NodeModel):
+    static: TableModel[LinearResistanceStaticSchema] = Field(
+        default_factory=TableModel[LinearResistanceStaticSchema]
     )
-    pid_control: PidControl = Field(
-        default_factory=lambda: PidControl.parse_obj({"static": None, "time": None})
-    )
-    level_boundary: LevelBoundary = Field(
-        default_factory=lambda: LevelBoundary.parse_obj({"static": None, "time": None})
-    )
-    pump: Pump = Field(default_factory=lambda: Pump.parse_obj({"static": None}))
-    tabulated_rating_curve: TabulatedRatingCurve = Field(
-        default_factory=lambda: TabulatedRatingCurve.parse_obj(
-            {"static": None, "time": None}
-        )
-    )
-    user: User = Field(
-        default_factory=lambda: User.parse_obj({"static": None, "time": None})
-    )
-    flow_boundary: FlowBoundary = Field(
-        default_factory=lambda: FlowBoundary.parse_obj({"static": None, "time": None})
-    )
-    basin: Basin = Field(
-        default_factory=lambda: Basin.parse_obj(
-            {"profile": None, "state": None, "static": None, "time": None}
-        )
-    )
-    manning_resistance: ManningResistance = Field(
-        default_factory=lambda: ManningResistance.parse_obj({"static": None})
-    )
-    discrete_control: DiscreteControl = Field(
-        default_factory=lambda: DiscreteControl.parse_obj(
-            {"condition": None, "logic": None}
-        )
-    )
-    outlet: Outlet = Field(default_factory=lambda: Outlet.parse_obj({"static": None}))
-    linear_resistance: LinearResistance = Field(
-        default_factory=lambda: LinearResistance.parse_obj({"static": None})
-    )
-    fractional_flow: FractionalFlow = Field(
-        default_factory=lambda: FractionalFlow.parse_obj({"static": None})
+
+
+class FractionalFlow(NodeModel):
+    static: TableModel[FractionalFlowStaticSchema] = Field(
+        default_factory=TableModel[FractionalFlowStaticSchema]
     )
diff --git a/python/ribasim/ribasim/geometry/edge.py b/python/ribasim/ribasim/geometry/edge.py
index 0d3c47bc7..64b0b50b6 100644
--- a/python/ribasim/ribasim/geometry/edge.py
+++ b/python/ribasim/ribasim/geometry/edge.py
@@ -1,33 +1,34 @@
-from typing import Any, Dict, Union
+from typing import Any
 
-import geopandas as gpd
 import matplotlib.pyplot as plt
 import numpy as np
+import pandas as pd
 import pandera as pa
 import shapely
-from geopandas import GeoDataFrame
 from matplotlib.axes import Axes
 from numpy.typing import NDArray
-from pandera.typing import DataFrame, Series
+from pandera.typing import Series
 from pandera.typing.geopandas import GeoSeries
 
-from ribasim.input_base import TableModel
-from ribasim.types import FilePath
+from ribasim.input_base import SpatialTableModel
 
 __all__ = ("Edge",)
 
 
-class StaticSchema(pa.SchemaModel):
+class EdgeSchema(pa.SchemaModel):
     name: Series[str] = pa.Field(default="")
-    from_node_id: Series[int] = pa.Field(coerce=True)
-    to_node_id: Series[int] = pa.Field(coerce=True)
-    geometry: GeoSeries[Any]
+    from_node_id: Series[int] = pa.Field(default=0, coerce=True)
+    to_node_id: Series[int] = pa.Field(default=0, coerce=True)
+    allocation_network_id: Series[pd.Int64Dtype] = pa.Field(
+        default=pd.NA, nullable=True, coerce=True
+    )
+    geometry: GeoSeries[Any] = pa.Field(default=None, nullable=True)
 
     class Config:
         add_missing_columns = True
 
 
-class Edge(TableModel):
+class Edge(SpatialTableModel[EdgeSchema]):
     """
     Defines the connections between nodes.
 
@@ -37,51 +38,8 @@ class Edge(TableModel):
         Table describing the flow connections.
     """
 
-    static: DataFrame[StaticSchema]
-
-    class Config:
-        validate_assignment = True
-
-    @classmethod
-    def _layername(cls, field) -> str:
-        return cls.get_input_type()
-
-    def write_layer(self, path: FilePath) -> None:
-        """
-        Write the contents of the input to a database.
-
-        Parameters
-        ----------
-        path : FilePath
-        """
-        self.sort()
-        dataframe = self.static
-        name = self._layername(dataframe)
-
-        gdf = gpd.GeoDataFrame(data=dataframe)
-        if "geometry" in gdf.columns:
-            gdf = gdf.set_geometry("geometry")
-        else:
-            gdf["geometry"] = None
-        gdf.to_file(path, layer=name, driver="GPKG")
-
-        return
-
-    @classmethod
-    def _kwargs_from_database(
-        cls, path: FilePath
-    ) -> Dict[str, Union[DataFrame[Any], GeoDataFrame, None]]:
-        kwargs = {}
-
-        field = "static"
-        layername = cls._layername(field)
-        df = gpd.read_file(path, layer=layername, engine="pyogrio", fid_as_index=True)
-        kwargs[field] = df
-
-        return kwargs
-
     def get_where_edge_type(self, edge_type: str) -> NDArray[np.bool_]:
-        return (self.static.edge_type == edge_type).to_numpy()
+        return (self.df.edge_type == edge_type).to_numpy()
 
     def plot(self, **kwargs) -> Axes:
         ax = kwargs.get("ax", None)
@@ -115,13 +73,13 @@ def plot(self, **kwargs) -> Axes:
         where_flow = self.get_where_edge_type("flow")
         where_control = self.get_where_edge_type("control")
 
-        self.static[where_flow].plot(**kwargs_flow)
+        self.df[where_flow].plot(**kwargs_flow)
 
         if where_control.any():
-            self.static[where_control].plot(**kwargs_control)
+            self.df[where_control].plot(**kwargs_control)
 
         # Determine the angle for every caret marker and where to place it.
-        coords = shapely.get_coordinates(self.static.geometry).reshape(-1, 2, 2)
+        coords = shapely.get_coordinates(self.df.geometry).reshape(-1, 2, 2)
         x, y = np.mean(coords, axis=1).T
         dx, dy = np.diff(coords, axis=1)[:, 0, :].T
         angle = np.degrees(np.arctan2(dy, dx)) - 90
@@ -130,7 +88,7 @@ def plot(self, **kwargs) -> Axes:
         # right is tedious.
         color = []
 
-        for i in range(len(self.static)):
+        for i in range(len(self.df)):
             if where_flow[i]:
                 color.append(color_flow)
             elif where_control[i]:
@@ -149,6 +107,3 @@ def plot(self, **kwargs) -> Axes:
             )
 
         return ax
-
-    def sort(self):
-        self.static = self.static.sort_index()
diff --git a/python/ribasim/ribasim/geometry/node.py b/python/ribasim/ribasim/geometry/node.py
index 2995abe66..a4f9f552e 100644
--- a/python/ribasim/ribasim/geometry/node.py
+++ b/python/ribasim/ribasim/geometry/node.py
@@ -1,54 +1,38 @@
-from typing import Any, Dict, Union
+from collections.abc import Sequence
+from typing import Any
 
-import geopandas as gpd
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
 import pandera as pa
-from geopandas import GeoDataFrame
-from pandera.typing import DataFrame, Series
+import shapely
+from numpy.typing import NDArray
+from pandera.typing import Series
 from pandera.typing.geopandas import GeoSeries
 
-from ribasim.input_base import TableModel
-from ribasim.types import FilePath
+from ribasim.input_base import SpatialTableModel
 
 __all__ = ("Node",)
 
 
-class StaticSchema(pa.SchemaModel):
+class NodeSchema(pa.SchemaModel):
     name: Series[str] = pa.Field(default="")
-    type: Series[str]
-    geometry: GeoSeries[Any]
+    type: Series[str] = pa.Field(default="")
+    allocation_network_id: Series[pd.Int64Dtype] = pa.Field(
+        default=pd.NA, nullable=True, coerce=True
+    )
+    geometry: GeoSeries[Any] = pa.Field(default=None, nullable=True)
 
     class Config:
         add_missing_columns = True
 
 
-class Node(TableModel):
-    """
-    The Ribasim nodes as Point geometries.
-
-    Parameters
-    ----------
-    static : geopandas.GeoDataFrame
-        Table with node ID, type and geometry.
-    """
-
-    static: DataFrame[StaticSchema]
-
-    class Config:
-        validate_assignment = True
-
-    @classmethod
-    def _layername(cls, field) -> str:
-        return cls.get_input_type()
-
-    @classmethod
-    def hasfid(cls):
-        return True
+class Node(SpatialTableModel[NodeSchema]):
+    """The Ribasim nodes as Point geometries."""
 
     @staticmethod
-    def get_node_ids_and_types(*nodes):
+    def node_ids_and_types(*nodes):
+        # TODO Not sure if this staticmethod belongs here
         data_types = {"node_id": int, "node_type": str}
         node_type = pd.DataFrame(
             {col: pd.Series(dtype=dtype) for col, dtype in data_types.items()}
@@ -58,17 +42,14 @@ def get_node_ids_and_types(*nodes):
             if not node:
                 continue
 
-            for table_type in ["static", "time", "condition"]:
-                if hasattr(node, table_type):
-                    table = getattr(node, table_type)
-                    if table is not None:
-                        node_type_table = pd.DataFrame(
-                            data={
-                                "node_id": table.node_id,
-                                "node_type": len(table) * [node.get_input_type()],
-                            }
-                        )
-                        node_type = node_type._append(node_type_table)
+            ids, types = node.node_ids_and_types()
+            node_type_table = pd.DataFrame(
+                data={
+                    "node_id": ids,
+                    "node_type": types,
+                }
+            )
+            node_type = node_type._append(node_type_table)
 
         node_type = node_type.drop_duplicates(subset="node_id")
         node_type = node_type.sort_values("node_id")
@@ -78,37 +59,76 @@ def get_node_ids_and_types(*nodes):
 
         return node_id, node_type
 
-    def write_layer(self, path: FilePath) -> None:
+    def geometry_from_connectivity(
+        self, from_id: Sequence[int], to_id: Sequence[int]
+    ) -> NDArray[Any]:
         """
-        Write the contents of the input to a database.
+        Create edge shapely geometries from connectivities.
 
         Parameters
         ----------
-        path : FilePath
-        """
-        self.sort()
-        dataframe = self.static
-        name = self._layername(dataframe)
-
-        gdf = gpd.GeoDataFrame(data=dataframe)
-        gdf = gdf.set_geometry("geometry")
+        node : Ribasim.Node
+        from_id : Sequence[int]
+            First node of every edge.
+        to_id : Sequence[int]
+            Second node of every edge.
 
-        gdf.to_file(path, layer=name, driver="GPKG")
+        Returns
+        -------
+        edge_geometry : np.ndarray
+            Array of shapely LineStrings.
+        """
+        geometry = self.df["geometry"]
+        from_points = shapely.get_coordinates(geometry.loc[from_id])
+        to_points = shapely.get_coordinates(geometry.loc[to_id])
+        n = len(from_points)
+        vertices = np.empty((n * 2, 2), dtype=from_points.dtype)
+        vertices[0::2, :] = from_points
+        vertices[1::2, :] = to_points
+        indices = np.repeat(np.arange(n), 2)
+        return shapely.linestrings(coords=vertices, indices=indices)
+
+    def connectivity_from_geometry(
+        self, lines: NDArray[Any]
+    ) -> tuple[NDArray[Any], NDArray[Any]]:
+        """
+        Derive from_node_id and to_node_id for every edge in lines. LineStrings
+        may be used to connect multiple nodes in a sequence, but every linestring
+        vertex must also a node.
 
-        return
+        Parameters
+        ----------
+        node : Node
+        lines : np.ndarray
+            Array of shapely linestrings.
 
-    @classmethod
-    def _kwargs_from_database(
-        cls, path: FilePath
-    ) -> Dict[str, Union[GeoDataFrame, DataFrame[Any], None]]:
-        kwargs = {}
+        Returns
+        -------
+        from_node_id : np.ndarray of int
+        to_node_id : np.ndarray of int
+        """
+        node_index = self.df.index
+        node_xy = shapely.get_coordinates(self.df.geometry.values)
+        edge_xy = shapely.get_coordinates(lines)
+
+        xy = np.vstack([node_xy, edge_xy])
+        _, inverse = np.unique(xy, return_inverse=True, axis=0)
+        _, index, inverse = np.unique(
+            xy, return_index=True, return_inverse=True, axis=0
+        )
+        uniques_index = index[inverse]
 
-        field = "static"
-        layername = cls._layername(field)
-        df = gpd.read_file(path, layer=layername, engine="pyogrio", fid_as_index=True)
-        kwargs[field] = df
+        node_node_id, edge_node_id = np.split(uniques_index, [len(node_xy)])
+        if not np.isin(edge_node_id, node_node_id).all():
+            raise ValueError(
+                "Edge lines contain coordinates that are not in the node layer. "
+                "Please ensure all edges are snapped to nodes exactly."
+            )
 
-        return kwargs
+        edge_node_id = edge_node_id.reshape((-1, 2))
+        from_id = node_index[edge_node_id[:, 0]].to_numpy()
+        to_id = node_index[edge_node_id[:, 1]].to_numpy()
+        return from_id, to_id
 
     def plot(self, ax=None, zorder=None) -> Any:
         """
@@ -161,7 +181,7 @@ def plot(self, ax=None, zorder=None) -> Any:
             "": "k",
         }
 
-        for nodetype, df in self.static.groupby("type"):
+        for nodetype, df in self.df.groupby("type"):
             assert isinstance(nodetype, str)
             marker = MARKERS[nodetype]
             color = COLORS[nodetype]
@@ -174,13 +194,8 @@ def plot(self, ax=None, zorder=None) -> Any:
                 label=nodetype,
             )
 
-        geometry = self.static["geometry"]
-        for text, xy in zip(
-            self.static.index, np.column_stack((geometry.x, geometry.y))
-        ):
+        geometry = self.df["geometry"]
+        for text, xy in zip(self.df.index, np.column_stack((geometry.x, geometry.y))):
             ax.annotate(text=text, xy=xy, xytext=(2.0, 2.0), textcoords="offset points")
 
         return ax
-
-    def sort(self):
-        self.static = self.static.sort_index()
diff --git a/python/ribasim/ribasim/input_base.py b/python/ribasim/ribasim/input_base.py
index cba18a57a..c7346ad7c 100644
--- a/python/ribasim/ribasim/input_base.py
+++ b/python/ribasim/ribasim/input_base.py
@@ -1,19 +1,45 @@
 import re
-import textwrap
+from abc import ABC, abstractmethod
+from collections.abc import Callable, Generator
 from contextlib import closing
+from contextvars import ContextVar
+from pathlib import Path
 from sqlite3 import Connection, connect
-from typing import Any, Dict, Set, Union
+from typing import (
+    Any,
+    Generic,
+    TypeVar,
+)
 
+import geopandas as gpd
 import pandas as pd
-from pandas import DataFrame
-from pydantic import BaseModel
+import pandera as pa
+from pandera.typing import DataFrame
+from pydantic import BaseModel as PydanticBaseModel
+from pydantic import (
+    ConfigDict,
+    DirectoryPath,
+    Field,
+    field_validator,
+    model_serializer,
+    model_validator,
+)
 
 from ribasim.types import FilePath
+from ribasim.utils import prefix_column
 
 __all__ = ("TableModel",)
 
 delimiter = " / "
 
+gpd.options.io_engine = "pyogrio"
+
+context_file_loading: ContextVar[dict[str, Any]] = ContextVar(
+    "file_loading", default={}
+)
+
+TableT = TypeVar("TableT", bound=pa.DataFrameModel)
+
 
 def esc_id(identifier: str) -> str:
     """Escape SQLite identifiers."""
@@ -30,65 +56,164 @@ def exists(connection: Connection, name: str) -> bool:
     return result is not None
 
 
-class TableModel(BaseModel):
-    class Config:
-        validate_assignment = True
+TABLES = ["profile", "state", "static", "time", "logic", "condition"]
+
+
+class BaseModel(PydanticBaseModel):
+    """Overrides Pydantic BaseModel to set our own config."""
+
+    model_config = ConfigDict(
+        validate_assignment=True,
+        validate_default=True,
+        populate_by_name=True,
+        use_enum_values=True,
+        extra="allow",
+    )
 
     @classmethod
-    def get_input_type(cls):
-        return cls.__name__
+    def fields(cls) -> list[str]:
+        """Return the names of the fields contained in the Model."""
+        return list(cls.model_fields.keys())
+
+
+class FileModel(BaseModel, ABC):
+    """Base class to represent models with a file representation.
+
+    It therefore always has a `filepath` and if it is given on
+    initialization, it will parse that file.
 
+    This class extends the `model_validator` option of Pydantic,
+    so when when a Path is given to a field with type `FileModel`,
+    it doesn't error, but actually initializes the `FileModel`.
+
+    Attributes
+    ----------
+        filepath (Path | None):
+            The path of this FileModel.
+    """
+
+    filepath: Path | None = Field(default=None, exclude=True, repr=False)
+
+    @model_validator(mode="before")
     @classmethod
-    def get_toml_key(cls):
-        """Get the class name in snake case, e.g. FlowBoundary -> flow_boundary."""
-        name_camel_case = cls.__name__
+    def check_filepath(cls, value: Any) -> Any:
+        # Enable initialization with a Path.
+        if isinstance(value, dict):
+            # Pydantic Model init requires a dict
+            filepath = value.get("filepath", None)
+            if filepath is not None:
+                filepath = Path(filepath)
+            data = cls._load(filepath)
+            value.update(data)
+            return value
+        elif isinstance(value, Path | str):
+            # Pydantic Model init requires a dict
+            data = cls._load(Path(value))
+            data["filepath"] = value
+            return data
+        else:
+            return value
 
-        # Insert underscore before capital letters
-        name_snake_case = re.sub(r"(?<!^)(?=[A-Z])", "_", name_camel_case)
+    @abstractmethod
+    def _save(self, directory: DirectoryPath) -> None:
+        """Save this instance to disk.
 
-        # Convert to lowercase
-        name_snake_case = name_snake_case.lower()
+        This method needs to be implemented by any class deriving from
+        FileModel.
 
-        return name_snake_case
+        Args:
+            save_settings (ModelSaveSettings): The model save settings.
+        """
+        raise NotImplementedError()
 
     @classmethod
-    def fields(cls):
-        """Return the input fields."""
-        return cls.__fields__.keys()
+    @abstractmethod
+    def _load(cls, filepath: Path | None) -> dict[str, Any]:
+        """Load the data at filepath and returns it as a dictionary.
 
-    def __repr__(self) -> str:
-        content = [f"<ribasim.{type(self).__name__}>"]
-        for field in self.fields():
-            attr = getattr(self, field)
-            if isinstance(attr, pd.DataFrame):
-                colnames = "(" + ", ".join(attr.columns) + ")"
-                if len(colnames) > 50:
-                    colnames = textwrap.indent(
-                        textwrap.fill(colnames, width=50), prefix="    "
-                    )
-                    entry = f"{field}: DataFrame(rows={len(attr)})\n{colnames}"
-                else:
-                    entry = f"{field}: DataFrame(rows={len(attr)}) {colnames}"
-            else:
-                entry = f"{field}: {attr}"
-            content.append(textwrap.indent(entry, prefix="   "))
-        return "\n".join(content)
+        If a derived FileModel does not load data from disk, this should
+        return an empty dictionary.
+
+        Args
+        ----
+            filepath (Path): Path to the data to load.
 
-    def get_node_IDs(self) -> Set[int]:
-        node_IDs: Set[int] = set()
-        for name in self.fields():
-            attr = getattr(self, name)
-            if isinstance(attr, pd.DataFrame):
-                if "node_id" in attr:
-                    node_IDs.update(attr["node_id"])
+        Returns
+        -------
+            dict: The data stored at filepath
+        """
+        raise NotImplementedError()
 
-        return node_IDs
 
+class TableModel(FileModel, Generic[TableT]):
+    df: DataFrame[TableT] | None = Field(default=None, exclude=True, repr=False)
+
+    @field_validator("df")
     @classmethod
-    def _layername(cls, field) -> str:
-        return f"{cls.get_input_type()}{delimiter}{field}"
+    def prefix_extra_columns(cls, v: DataFrame[TableT]):
+        """Prefix extra columns with meta_."""
+        if isinstance(v, pd.DataFrame):
+            v.rename(
+                lambda x: prefix_column(x, cls.columns()), axis="columns", inplace=True
+            )
+        return v
+
+    @model_serializer
+    def set_model(self) -> Path | None:
+        return self.filepath
+
+    @classmethod
+    def tablename(cls) -> str:
+        """Retrieve tablename based on attached Schema.
 
-    def write_table(self, connection: Connection) -> None:
+        NodeSchema -> Schema
+        TabularRatingCurveStaticSchema -> TabularRatingCurve / Static
+        """
+        names: list[str] = re.sub("([A-Z]+)", r" \1", str(cls.tableschema())).split()
+        if len(names) > 2:
+            return f"{''.join(names[:-2])}{delimiter}{names[-2].lower()}"
+        else:
+            return names[0]
+
+    @model_validator(mode="before")
+    @classmethod
+    def check_dataframe(cls, value: Any) -> Any:
+        # Enable initialization with a DataFrame.
+        if isinstance(value, pd.DataFrame | gpd.GeoDataFrame):
+            value = {"df": value}
+
+        return value
+
+    def node_ids(self) -> set[int]:
+        node_ids: set[int] = set()
+        if self.df is not None and "node_id" in self.df.columns:
+            node_ids.update(self.df["node_id"])
+
+        return node_ids
+
+    @classmethod
+    def _load(cls, filepath: Path | None) -> dict[str, Any]:
+        db = context_file_loading.get().get("database")
+        if filepath is not None:
+            adf = cls._from_arrow(filepath)
+            # TODO Store filepath?
+            return {"df": adf}
+        elif db is not None:
+            ddf = cls._from_db(db, cls.tablename())
+            return {"df": ddf}
+        else:
+            return {}
+
+    def _save(
+        self, directory: DirectoryPath, sort_keys: list[str] = ["node_id"]
+    ) -> None:
+        # TODO directory could be used to save an arrow file
+        db_path = context_file_loading.get().get("database")
+        if self.df is not None and db_path is not None:
+            self.sort(sort_keys)
+            self._write_table(db_path)
+
+    def _write_table(self, temp_path: Path) -> None:
         """
         Write the contents of the input to a database.
 
@@ -97,103 +222,144 @@ def write_table(self, connection: Connection) -> None:
         connection : Connection
             SQLite connection to the database.
         """
-        self.sort()
-        sql = "INSERT INTO gpkg_contents (table_name, data_type, identifier) VALUES (?, ?, ?)"
-        for field in self.fields():
-            dataframe = getattr(self, field)
-            if dataframe is None:
-                continue
-            name = self._layername(field)
-
-            dataframe.to_sql(name, connection, index=False, if_exists="replace")
-            with closing(connection.cursor()) as cursor:
-                cursor.execute(sql, (name, "attributes", name))
+        table = self.tablename()
+        if self.df is not None:  # double check to make mypy happy
+            with closing(connect(temp_path)) as connection:
+                self.df.to_sql(table, connection, index=False, if_exists="replace")
 
-        return
+                # Set geopackage attribute table
+                with closing(connection.cursor()) as cursor:
+                    sql = "INSERT INTO gpkg_contents (table_name, data_type, identifier) VALUES (?, ?, ?)"
+                    cursor.execute(sql, (table, "attributes", table))
+                connection.commit()
 
     @classmethod
-    def _kwargs_from_database(cls, path: FilePath) -> Dict[str, Union[DataFrame, None]]:
-        kwargs = {}
+    def _from_db(cls, path: FilePath, table: str) -> pd.DataFrame | None:
         with connect(path) as connection:
-            for key in cls.fields():
-                layername = cls._layername(key)
+            if exists(connection, table):
+                query = f"select * from {esc_id(table)}"
+                df = pd.read_sql_query(query, connection, parse_dates=["time"])
+            else:
+                df = None
 
-                if exists(connection, layername):
-                    query = f"select * from {esc_id(layername)}"
-                    df = pd.read_sql_query(query, connection, parse_dates=["time"])
-                else:
-                    df = None
+            return df
 
-                kwargs[key] = df
+    @classmethod
+    def _from_arrow(cls, path: FilePath) -> pd.DataFrame:
+        return pd.read_feather(path)
 
-        return kwargs
+    def sort(self, sort_keys: list[str] = ["node_id"]):
+        """Sort all input tables as required.
 
-    @classmethod
-    def _kwargs_from_toml(cls, config: Dict[str, Any]) -> Dict[str, pd.DataFrame]:
-        return {key: pd.read_feather(path) for key, path in config.items()}
+        Tables are sorted by "node_id", unless otherwise specified.
+        Sorting is done automatically before writing the table.
+        """
+        if self.df is not None:
+            self.df.sort_values(sort_keys, ignore_index=True, inplace=True)
 
     @classmethod
-    def from_database(cls, path: FilePath):
+    def tableschema(cls) -> TableT:
+        """Retrieve Pandera Schema.
+
+        The type of the field `df` is known to always be an DataFrame[TableT]]] | None
         """
-        Initialize input from a database.
+        optionalfieldtype = cls.model_fields["df"].annotation
+        fieldtype = optionalfieldtype.__args__[0]  # type: ignore
+        T: TableT = fieldtype.__args__[0]
+        return T
 
-        The database tables are searched for the relevant table names.
+    @classmethod
+    def record(cls) -> type[PydanticBaseModel] | None:
+        """Retrieve Pydantic Record used in Pandera Schema."""
+        T = cls.tableschema()
+        if hasattr(T.Config, "dtype"):
+            # We always set a PydanticBaseModel dtype (see schemas.py)
+            return T.Config.dtype.type  # type: ignore
+        else:
+            return None
 
-        Parameters
-        ----------
-        path : Path
-            Path to the database.
+    @classmethod
+    def columns(cls) -> list[str]:
+        """Retrieve column names."""
+        T = cls.record()
+        if T is not None:
+            return list(T.model_fields.keys())
+        else:
+            return []
 
-        Returns
-        -------
-        ribasim_input
-        """
-        kwargs = cls._kwargs_from_database(path)
-        return cls(**kwargs)
 
+class SpatialTableModel(TableModel[TableT], Generic[TableT]):
     @classmethod
-    def from_config(cls, config: Dict[str, Any]):
-        """
-        Initialize input from a TOML configuration file.
+    def _from_db(cls, path: FilePath, table: str):
+        with connect(path) as connection:
+            if exists(connection, table):
+                df = gpd.read_file(path, layer=table, fid_as_index=True)
+            else:
+                print(f"Can't read from {path}:{table}")
+                df = None
 
-        The database tables are searched for the relevant table names. Arrow
-        tables will also be read if specified. If a table is present in both
-        the database and as an Arrow table, the data of the Arrow table is
-        used.
+            return df
+
+    def _write_table(self, path: FilePath) -> None:
+        """
+        Write the contents of the input to a database.
 
         Parameters
         ----------
-        config : Dict[str, Any]
-
-        Returns
-        -------
-        ribasim_input
+        path : FilePath
         """
-        database = config["database"]
-        kwargs = cls._kwargs_from_database(database)
-        input_content = config.get(cls.get_input_type(), None)
-        if input_content:
-            kwargs.update(**cls._kwargs_from_toml(config))
 
-        if all(v is None for v in kwargs.values()):
-            return None
-        else:
-            return cls(**kwargs)
+        gdf = gpd.GeoDataFrame(data=self.df)
+        gdf = gdf.set_geometry("geometry")
+
+        gdf.to_file(path, layer=self.tablename(), driver="GPKG")
+
+    def sort(self, sort_keys: list[str] = ["node_id"]):
+        self.df.sort_index(inplace=True)
+
+
+class NodeModel(BaseModel):
+    """Base class to handle combining the tables for a single node type."""
+
+    _sort_keys: dict[str, list[str]] = {}
+
+    @model_serializer(mode="wrap")
+    def set_modeld(
+        self, serializer: Callable[[type["NodeModel"]], dict[str, Any]]
+    ) -> dict[str, Any]:
+        content = serializer(self)
+        return dict(filter(lambda x: x[1], content.items()))
 
     @classmethod
-    def hasfid(cls):
-        return False
+    def get_input_type(cls):
+        return cls.__name__
 
-    def sort(self):
-        """Sort all input tables as required.
+    @classmethod
+    def _layername(cls, field: str) -> str:
+        return f"{cls.get_input_type()}{delimiter}{field}"
 
-        Tables are sorted by "node_id", unless otherwise specified.
-        Sorting is done automatically before writing the table.
-        """
+    def add(*args, **kwargs):
+        # TODO This is the new API
+        pass
+
+    def tables(self) -> Generator[TableModel[Any], Any, None]:
+        for key in self.fields():
+            attr = getattr(self, key)
+            if isinstance(attr, TableModel):
+                yield attr
+
+    def node_ids(self):
+        node_ids: set[int] = set()
+        for table in self.tables():
+            node_ids.update(table.node_ids())
+        return node_ids
+
+    def node_ids_and_types(self) -> tuple[list[int], list[str]]:
+        ids = self.node_ids()
+        return list(ids), len(ids) * [self.get_input_type()]
+
+    def _save(self, directory: DirectoryPath):
         for field in self.fields():
-            dataframe = getattr(self, field)
-            if dataframe is None:
-                continue
-            else:
-                dataframe.sort_values("node_id", ignore_index=True, inplace=True)
-        return
+            getattr(self, field)._save(
+                directory, sort_keys=self._sort_keys.get("field", ["node_id"])
+            )
diff --git a/python/ribasim/ribasim/model.py b/python/ribasim/ribasim/model.py
index 7632cc3be..923078a3b 100644
--- a/python/ribasim/ribasim/model.py
+++ b/python/ribasim/ribasim/model.py
@@ -1,43 +1,87 @@
 import datetime
-import inspect
 import shutil
-from contextlib import closing
 from pathlib import Path
-from sqlite3 import connect
-from typing import Any, Optional, Type, cast
+from typing import Any
 
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
 import tomli
 import tomli_w
-from pydantic import BaseModel
-
-from ribasim import geometry, node_types
-from ribasim.config import Allocation, Logging, Solver
+from pydantic import DirectoryPath, Field, model_serializer, model_validator
+
+from ribasim.config import (
+    Allocation,
+    Basin,
+    DiscreteControl,
+    FlowBoundary,
+    FractionalFlow,
+    LevelBoundary,
+    LinearResistance,
+    Logging,
+    ManningResistance,
+    Outlet,
+    PidControl,
+    Pump,
+    Results,
+    Solver,
+    TabulatedRatingCurve,
+    Terminal,
+    User,
+)
 from ribasim.geometry.edge import Edge
 from ribasim.geometry.node import Node
-
-# Do not import from ribasim namespace: will create import errors.
-# E.g. not: from ribasim import Basin
-from ribasim.input_base import TableModel
-from ribasim.node_types.basin import Basin
-from ribasim.node_types.discrete_control import DiscreteControl
-from ribasim.node_types.flow_boundary import FlowBoundary
-from ribasim.node_types.fractional_flow import FractionalFlow
-from ribasim.node_types.level_boundary import LevelBoundary
-from ribasim.node_types.linear_resistance import LinearResistance
-from ribasim.node_types.manning_resistance import ManningResistance
-from ribasim.node_types.outlet import Outlet
-from ribasim.node_types.pid_control import PidControl
-from ribasim.node_types.pump import Pump
-from ribasim.node_types.tabulated_rating_curve import TabulatedRatingCurve
-from ribasim.node_types.terminal import Terminal
-from ribasim.node_types.user import User
+from ribasim.input_base import FileModel, NodeModel, TableModel, context_file_loading
 from ribasim.types import FilePath
 
 
-class Model(BaseModel):
+class Network(FileModel, NodeModel):
+    node: Node = Field(default_factory=Node)
+    edge: Edge = Field(default_factory=Edge)
+
+    def n_nodes(self):
+        if self.node.df is not None:
+            n = len(self.node.df)
+        else:
+            n = 0
+
+        return n
+
+    @classmethod
+    def _load(cls, filepath: Path | None) -> dict[str, Any]:
+        if filepath is not None:
+            context_file_loading.get()["database"] = filepath
+        return {}
+
+    @classmethod
+    def _layername(cls, field: str) -> str:
+        return field.capitalize()
+
+    def _save(self, directory):
+        # We write all tables to a temporary database with a dot prefix,
+        # and at the end move this over the target file.
+        # This does not throw a PermissionError if the file is open in QGIS.
+        directory = Path(directory)
+        db_path = directory / "database.gpkg"
+        db_path = db_path.resolve()
+        temp_path = db_path.with_stem(".database")
+
+        # avoid adding tables to existing model
+        temp_path.unlink(missing_ok=True)
+        context_file_loading.get()["database"] = temp_path
+
+        self.node._save(directory)
+        self.edge._save(directory)
+
+        shutil.move(temp_path, db_path)
+        context_file_loading.get()["database"] = db_path
+
+    @model_serializer
+    def set_modelname(self) -> str:
+        return "database.gpkg"
+
+
+class Model(FileModel):
     """
     A full Ribasim model schematisation with all input.
 
@@ -46,76 +90,89 @@ class Model(BaseModel):
 
     Parameters
     ----------
-    node : Node
-        The ID, type and geometry of each node.
-    edge : Edge
-        How the nodes are connected.
+    starttime : datetime.datetime
+        Starting time of the simulation.
+    endtime : datetime.datetime
+        End time of the simulation.
+
+    update_timestep: float = 86400
+        The output time step of the simulation in seconds (default of 1 day)
+    relative_dir: str = "."
+        The relative directory of the input files.
+    input_dir: str = "."
+        The directory of the input files.
+    results_dir: str = "."
+        The directory of the results files.
+
+    network: Network
+        Class containing the topology (nodes and edges) of the model.
+
+    results: Results
+        Results configuration options.
+    solver: Solver
+        Solver configuration options.
+    logging: Logging
+        Logging configuration options.
+
+    allocation: Allocation
+        The allocation configuration.
     basin : Basin
         The waterbodies.
-    fractional_flow : Optional[FractionalFlow]
+    fractional_flow : FractionalFlow
         Split flows into fractions.
-    level_boundary : Optional[LevelBoundary]
+    level_boundary : LevelBoundary
         Boundary condition specifying the water level.
-    flow_boundary : Optional[FlowBoundary]
+    flow_boundary : FlowBoundary
         Boundary conditions specifying the flow.
-    linear_resistance: Optional[LinearResistance]
+    linear_resistance: LinearResistance
         Linear flow resistance.
-    manning_resistance : Optional[ManningResistance]
+    manning_resistance : ManningResistance
         Flow resistance based on the Manning formula.
-    tabulated_rating_curve : Optional[TabulatedRatingCurve]
+    tabulated_rating_curve : TabulatedRatingCurve
         Tabulated rating curve describing flow based on the upstream water level.
-    pump : Optional[Pump]
+    pump : Pump
         Prescribed flow rate from one basin to the other.
-    outlet : Optional[Outlet]
+    outlet : Outlet
         Prescribed flow rate from one basin to the other.
-    terminal : Optional[Terminal]
+    terminal : Terminal
         Water sink without state or properties.
-    discrete_control : Optional[DiscreteControl]
+    discrete_control : DiscreteControl
         Discrete control logic.
-    pid_control : Optional[PidControl]
+    pid_control : PidControl
         PID controller attempting to set the level of a basin to a desired value using a pump/outlet.
-    user : Optional[User]
+    user : User
         User node type with demand and priority.
-    starttime : Union[str, datetime.datetime]
-        Starting time of the simulation.
-    endtime : Union[str, datetime.datetime]
-        End time of the simulation.
-    allocation : Optional[Allocation]
-        Allocation settings.
-    solver : Optional[Solver]
-        Solver settings.
-    logging : Optional[logging]
-        Logging settings.
     """
 
-    node: Node
-    edge: Edge
-    basin: Basin
-    fractional_flow: Optional[FractionalFlow]
-    level_boundary: Optional[LevelBoundary]
-    flow_boundary: Optional[FlowBoundary]
-    linear_resistance: Optional[LinearResistance]
-    manning_resistance: Optional[ManningResistance]
-    tabulated_rating_curve: Optional[TabulatedRatingCurve]
-    pump: Optional[Pump]
-    outlet: Optional[Outlet]
-    terminal: Optional[Terminal]
-    discrete_control: Optional[DiscreteControl]
-    pid_control: Optional[PidControl]
-    user: Optional[User]
     starttime: datetime.datetime
     endtime: datetime.datetime
-    allocation: Optional[Allocation]
-    solver: Optional[Solver]
-    logging: Optional[Logging]
 
-    class Config:
-        validate_assignment = True
-
-    @classmethod
-    def fields(cls):
-        """Return the names of the fields contained in the Model."""
-        return cls.__fields__.keys()
+    update_timestep: float = 86400
+    relative_dir: str = "."
+    input_dir: str = "."
+    results_dir: str = "."
+
+    network: Network = Field(default_factory=Network, alias="database")
+    results: Results = Results()
+    solver: Solver = Solver()
+    logging: Logging = Logging()
+
+    allocation: Allocation = Field(default_factory=Allocation)
+    basin: Basin = Field(default_factory=Basin)
+    fractional_flow: FractionalFlow = Field(default_factory=FractionalFlow)
+    level_boundary: LevelBoundary = Field(default_factory=LevelBoundary)
+    flow_boundary: FlowBoundary = Field(default_factory=FlowBoundary)
+    linear_resistance: LinearResistance = Field(default_factory=LinearResistance)
+    manning_resistance: ManningResistance = Field(default_factory=ManningResistance)
+    tabulated_rating_curve: TabulatedRatingCurve = Field(
+        default_factory=TabulatedRatingCurve
+    )
+    pump: Pump = Field(default_factory=Pump)
+    outlet: Outlet = Field(default_factory=Outlet)
+    terminal: Terminal = Field(default_factory=Terminal)
+    discrete_control: DiscreteControl = Field(default_factory=DiscreteControl)
+    pid_control: PidControl = Field(default_factory=PidControl)
+    user: User = Field(default_factory=User)
 
     def __repr__(self) -> str:
         first = []
@@ -135,153 +192,82 @@ def _repr_html(self):
 
     def _write_toml(self, directory: FilePath):
         directory = Path(directory)
-        content = {
-            "starttime": self.starttime,
-            "endtime": self.endtime,
-            "database": "database.gpkg",
-        }
-        if self.solver is not None:
-            section = {k: v for k, v in self.solver.dict().items() if v is not None}
-            content["solver"] = section
-
-        if self.allocation is not None:
-            section = {k: v for k, v in self.allocation.dict().items() if v is not None}
-            content["allocation"] = section
-
-        # TODO This should be rewritten as self.dict(exclude_unset=True, exclude_defaults=True)
-        # after we make sure that we have a (sub)model that's only the config, instead
-        # the mix of models and config it is now.
-        if self.logging is not None:
-            section = {k: v for k, v in self.logging.dict().items() if v is not None}
-            content["logging"] = section
-
-        with open(directory / "ribasim.toml", "wb") as f:
-            tomli_w.dump(content, f)
-        return
 
-    def _write_tables(self, directory: FilePath) -> None:
-        """Write the input to database tables."""
-        # We write all tables to a temporary database with a dot prefix,
-        # and at the end move this over the target file.
-        # This does not throw a PermissionError if the file is open in QGIS.
-        directory = Path(directory)
-        db_path = directory / "database.gpkg"
-        temp_path = db_path.with_stem(".database.gpkg")
-        # avoid adding tables to existing model
-        temp_path.unlink(missing_ok=True)
+        content = self.model_dump(exclude_unset=True, exclude_none=True, by_alias=True)
+        # Filter empty dicts (default Nodes)
+        content = dict(filter(lambda x: x[1], content.items()))
 
-        # write to database using geopandas
-        self.node.write_layer(temp_path)
-        self.edge.write_layer(temp_path)
-
-        # write to database using sqlite3
-        with closing(connect(temp_path)) as connection:
-            for name in self.fields():
-                input_entry = getattr(self, name)
-                is_geometry = isinstance(input_entry, Node) or isinstance(
-                    input_entry, Edge
-                )
-                if isinstance(input_entry, TableModel) and not is_geometry:
-                    input_entry.write_table(connection)
-            connection.commit()
-
-        shutil.move(temp_path, db_path)
-        return
-
-    @staticmethod
-    def get_node_types():
-        node_names_all, node_cls_all = list(
-            zip(*inspect.getmembers(node_types, inspect.isclass))
-        )
-        return node_names_all, node_cls_all
-
-    def validate_model_node_types(self):
-        """Check whether all node types in the node field are valid."""
-
-        node_names_all, _ = Model.get_node_types()
-
-        invalid_node_types = set()
+        fn = directory / "ribasim.toml"
+        with open(fn, "wb") as f:
+            tomli_w.dump(content, f)
+        return fn
 
-        # Check node types
-        for node_type in self.node.static["type"]:
-            if node_type not in node_names_all:
-                invalid_node_types.add(node_type)
+    def _save(self, directory: DirectoryPath):
+        for sub in self.nodes().values():
+            sub._save(directory)
 
-        if len(invalid_node_types) > 0:
-            invalid_node_types = ", ".join(invalid_node_types)
-            raise TypeError(
-                f"Invalid node types detected: [{invalid_node_types}]. Choose from: {', '.join(node_names_all)}."
-            )
+    def nodes(self):
+        return {
+            k: getattr(self, k)
+            for k in self.model_fields.keys()
+            if isinstance(getattr(self, k), NodeModel)
+        }
 
-    def validate_model_node_field_IDs(self):
+    def validate_model_node_field_ids(self):
         """Check whether the node IDs of the node_type fields are valid."""
 
-        _, node_cls_all = Model.get_node_types()
-
-        node_names_all_snake_case = [cls.get_toml_key() for cls in node_cls_all]
+        n_nodes = self.network.n_nodes()
 
         # Check node IDs of node fields
-        node_IDs_all = []
-        n_nodes = len(self.node.static)
+        all_node_ids = set[int]()
+        for node in self.nodes().values():
+            all_node_ids.update(node.node_ids())
 
-        for name in self.fields():
-            if name in node_names_all_snake_case:
-                if node_field := getattr(self, name):
-                    node_IDs_field = node_field.get_node_IDs()
-                    node_IDs_all.append(list(node_IDs_field))
+        unique, counts = np.unique(list(all_node_ids), return_counts=True)
 
-        node_IDs_all = np.concatenate(node_IDs_all)
-        node_IDs_unique, node_ID_counts = np.unique(node_IDs_all, return_counts=True)
-
-        node_IDs_positive_integers = np.greater(node_IDs_unique, 0) & np.equal(
-            node_IDs_unique.astype(int), node_IDs_unique
+        node_ids_positive_integers = np.greater(unique, 0) & np.equal(
+            unique.astype(int), unique
         )
 
-        if not node_IDs_positive_integers.all():
+        if not node_ids_positive_integers.all():
             raise ValueError(
-                f"Node IDs must be positive integers, got {node_IDs_unique[~node_IDs_positive_integers]}."
+                f"Node IDs must be positive integers, got {unique[~node_ids_positive_integers]}."
             )
 
-        if (node_ID_counts > 1).any():
+        if (counts > 1).any():
             raise ValueError(
-                f"These node IDs were assigned to multiple node types: {node_IDs_unique[(node_ID_counts > 1)]}."
+                f"These node IDs were assigned to multiple node types: {unique[(counts > 1)]}."
             )
 
-        if not np.array_equal(node_IDs_unique, np.arange(n_nodes) + 1):
-            node_IDs_missing = set(np.arange(n_nodes) + 1) - set(node_IDs_unique)
-            node_IDs_over = set(node_IDs_unique) - set(np.arange(n_nodes) + 1)
+        if not np.array_equal(unique, np.arange(n_nodes) + 1):
+            node_ids_missing = set(np.arange(n_nodes) + 1) - set(unique)
+            node_ids_over = set(unique) - set(np.arange(n_nodes) + 1)
             msg = [
-                f"Expected node IDs from 1 to {n_nodes} (the number of rows in self.node.static)."
+                f"Expected node IDs from 1 to {n_nodes} (the number of rows in self.network.node.df)."
             ]
-            if len(node_IDs_missing) > 0:
-                msg.append(f"These node IDs are missing: {node_IDs_missing}.")
+            if len(node_ids_missing) > 0:
+                msg.append(f"These node IDs are missing: {node_ids_missing}.")
 
-            if len(node_IDs_over) > 0:
-                msg.append(f"These node IDs are unexpected: {node_IDs_over}.")
+            if len(node_ids_over) > 0:
+                msg.append(f"These node IDs are unexpected: {node_ids_over}.")
 
             raise ValueError(" ".join(msg))
 
-    def validate_model_node_IDs(self):
+    def validate_model_node_ids(self):
         """Check whether the node IDs in the node field correspond to the node IDs on the node type fields."""
 
-        _, node_cls_all = Model.get_node_types()
-
-        node_names_all_snake_case = [cls.get_toml_key() for cls in node_cls_all]
-
         error_messages = []
 
-        for name in self.fields():
-            if name in node_names_all_snake_case:
-                if attr := getattr(self, name):
-                    node_IDs_field = attr.get_node_IDs()
-                    node_IDs_from_node_field = self.node.static.loc[
-                        self.node.static["type"] == attr.get_input_type()
-                    ].index
+        for node in self.nodes().values():
+            node_ids_field = node.node_ids()
+            node_ids_from_node_field = self.network.node.df.loc[
+                self.network.node.df["type"] == node.get_input_type()
+            ].index
 
-                    if not set(node_IDs_from_node_field) == set(node_IDs_field):
-                        error_messages.append(
-                            f"The node IDs in the field {name} {node_IDs_field} do not correspond with the node IDs in the field node {node_IDs_from_node_field.tolist()}."
-                        )
+            if not set(node_ids_from_node_field) == set(node_ids_field):
+                error_messages.append(
+                    f"The node IDs in the field {node} {node_ids_field} do not correspond with the node IDs in the field node {node_ids_from_node_field.tolist()}."
+                )
 
         if len(error_messages) > 0:
             raise ValueError("\n".join(error_messages))
@@ -290,16 +276,14 @@ def validate_model(self):
         """Validate the model.
 
         Checks:
-        - Whether all node types in the node field are valid
         - Whether the node IDs of the node_type fields are valid
         - Whether the node IDs in the node field correspond to the node IDs on the node type fields
         """
 
-        self.validate_model_node_types()
-        self.validate_model_node_field_IDs()
-        self.validate_model_node_IDs()
+        self.validate_model_node_field_ids()
+        self.validate_model_node_ids()
 
-    def write(self, directory: FilePath) -> None:
+    def write(self, directory: FilePath) -> Path:
         """
         Write the contents of the model to a database and a TOML configuration file.
 
@@ -310,15 +294,37 @@ def write(self, directory: FilePath) -> None:
         directory: FilePath
         """
         self.validate_model()
-
+        context_file_loading.set({})
         directory = Path(directory)
         directory.mkdir(parents=True, exist_ok=True)
-        self._write_toml(directory)
-        self._write_tables(directory)
-        return
+        self._save(directory)
+        fn = self._write_toml(directory)
+
+        context_file_loading.set({})
+        return fn
 
-    @staticmethod
-    def from_toml(path: FilePath) -> "Model":
+    @classmethod
+    def _load(cls, filepath: Path | None) -> dict[str, Any]:
+        context_file_loading.set({})
+
+        if filepath is not None:
+            with open(filepath, "rb") as f:
+                config = tomli.load(f)
+
+            # Convert relative path to absolute path
+            config["database"] = filepath.parent / config["database"]
+            return config
+        else:
+            return {}
+
+    @model_validator(mode="after")
+    def reset_contextvar(self) -> "Model":
+        # Drop database info
+        context_file_loading.set({})
+        return self
+
+    @classmethod
+    def from_toml(cls, path: Path | str) -> "Model":
         """
         Initialize a model from the TOML configuration file.
 
@@ -331,48 +337,33 @@ def from_toml(path: FilePath) -> "Model":
         -------
         model : Model
         """
-
-        path = Path(path)
-        with open(path, "rb") as f:
-            config = tomli.load(f)
-
-        kwargs: dict[str, Any] = {}
-        config["database"] = path.parent / config["database"]
-
-        for module in [geometry, node_types]:
-            for _, node_type_cls in inspect.getmembers(module, inspect.isclass):
-                cls_casted = cast(Type[TableModel], node_type_cls)
-                kwargs[node_type_cls.get_toml_key()] = cls_casted.from_config(config)
-
-        kwargs["starttime"] = config["starttime"]
-        kwargs["endtime"] = config["endtime"]
-        kwargs["solver"] = config.get("solver")
-
-        return Model(**kwargs)
+        kwargs = cls._load(Path(path))
+        return cls(**kwargs)
 
     def plot_control_listen(self, ax):
         x_start, x_end = [], []
         y_start, y_end = [], []
 
-        if self.discrete_control:
-            condition = self.discrete_control.condition
-
+        condition = self.discrete_control.condition.df
+        if condition is not None:
             for node_id in condition.node_id.unique():
                 data_node_id = condition[condition.node_id == node_id]
 
                 for listen_feature_id in data_node_id.listen_feature_id:
-                    point_start = self.node.static.iloc[node_id - 1].geometry
+                    point_start = self.network.node.df.iloc[node_id - 1].geometry
                     x_start.append(point_start.x)
                     y_start.append(point_start.y)
 
-                    point_end = self.node.static.iloc[listen_feature_id - 1].geometry
+                    point_end = self.network.node.df.iloc[
+                        listen_feature_id - 1
+                    ].geometry
                     x_end.append(point_end.x)
                     y_end.append(point_end.y)
 
-        if self.pid_control:
-            static = self.pid_control.static
-            time = self.pid_control.time
-            node_static = self.node.static
+        if self.pid_control.static.df is not None:
+            static = self.pid_control.static.df
+            time = self.pid_control.time.df
+            node_static = self.network.node.static.df
 
             for table in [static, time]:
                 if table is None:
@@ -419,34 +410,22 @@ def plot(self, ax=None) -> Any:
         if ax is None:
             _, ax = plt.subplots()
             ax.axis("off")
-        self.edge.plot(ax=ax, zorder=2)
+        self.network.edge.plot(ax=ax, zorder=2)
         self.plot_control_listen(ax)
-        self.node.plot(ax=ax, zorder=3)
+        self.network.node.plot(ax=ax, zorder=3)
 
         ax.legend(loc="lower left", bbox_to_anchor=(1, 0.5))
 
         return ax
 
-    def sort(self):
-        """
-        Sort all input tables as required.
-
-        Tables are sorted by "node_id", unless otherwise specified.
-        Sorting is done automatically before writing the table.
-        """
-        for name in self.fields():
-            input_entry = getattr(self, name)
-            if isinstance(input_entry, TableModel):
-                input_entry.sort()
-
     def print_discrete_control_record(self, path: FilePath) -> None:
         path = Path(path)
         df_control = pd.read_feather(path)
-        node_types, node_clss = Model.get_node_types()
-
+        node_attrs, node_instances = zip(*self.nodes().items())
+        node_clss = [node_cls.get_input_type() for node_cls in node_instances]
         truth_dict = {"T": ">", "F": "<"}
 
-        if not self.discrete_control:
+        if self.discrete_control.condition.df is None:
             raise ValueError("This model has no control input.")
 
         for index, row in df_control.iterrows():
@@ -458,8 +437,11 @@ def print_discrete_control_record(self, path: FilePath) -> None:
 
             out = f"{enumeration}At {datetime} the control node with ID {control_node_id} reached truth state {truth_state}:\n"
 
-            conditions = self.discrete_control.condition[
-                self.discrete_control.condition.node_id == control_node_id
+            if self.discrete_control.condition.df is None:
+                return
+
+            conditions = self.discrete_control.condition.df[
+                self.discrete_control.condition.df.node_id == control_node_id
             ]
 
             for truth_value, (index, condition) in zip(
@@ -467,7 +449,7 @@ def print_discrete_control_record(self, path: FilePath) -> None:
             ):
                 var = condition["variable"]
                 listen_feature_id = condition["listen_feature_id"]
-                listen_node_type = self.node.static.loc[listen_feature_id, "type"]
+                listen_node_type = self.network.node.df.loc[listen_feature_id, "type"]
                 symbol = truth_dict[truth_value]
                 greater_than = condition["greater_than"]
                 feature_type = "edge" if var == "flow" else "node"
@@ -477,19 +459,17 @@ def print_discrete_control_record(self, path: FilePath) -> None:
             padding = len(enumeration) * " "
             out += f'\n{padding}This yielded control state "{control_state}":\n'
 
-            affect_node_ids = self.edge.static[
-                self.edge.static.from_node_id == control_node_id
+            affect_node_ids = self.network.edge.df[
+                self.network.edge.df.from_node_id == control_node_id
             ].to_node_id
 
             for affect_node_id in affect_node_ids:
-                affect_node_type = self.node.static.loc[affect_node_id, "type"]
-                affect_node_type_snake_case = node_clss[
-                    node_types.index(affect_node_type)
-                ].get_toml_key()
+                affect_node_type = self.network.node.df.loc[affect_node_id, "type"]
+                nodeattr = node_attrs[node_clss.index(affect_node_type)]
 
                 out += f"\tFor node ID {affect_node_id} ({affect_node_type}): "
 
-                static = getattr(self, affect_node_type_snake_case).static
+                static = getattr(self, nodeattr).static.df
                 row = static[
                     (static.node_id == affect_node_id)
                     & (static.control_state == control_state)
diff --git a/python/ribasim/ribasim/models.py b/python/ribasim/ribasim/models.py
index f5a6487fb..1d82a6fa8 100644
--- a/python/ribasim/ribasim/models.py
+++ b/python/ribasim/ribasim/models.py
@@ -4,9 +4,10 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Optional
 
-from pydantic import BaseModel, Field
+from pydantic import Field
+
+from ribasim.input_base import BaseModel
 
 
 class BasinProfile(BaseModel):
@@ -48,7 +49,7 @@ class DiscreteControlCondition(BaseModel):
     listen_feature_id: int
     variable: str
     greater_than: float
-    look_ahead: Optional[float] = None
+    look_ahead: float | None = None
     remarks: str = Field("", description="a hack for pandera")
 
 
@@ -65,13 +66,13 @@ class Edge(BaseModel):
     from_node_id: int
     to_node_id: int
     edge_type: str
-    allocation_network_id: Optional[int] = None
+    allocation_network_id: int | None = None
     remarks: str = Field("", description="a hack for pandera")
 
 
 class FlowBoundaryStatic(BaseModel):
     node_id: int
-    active: Optional[bool] = None
+    active: bool | None = None
     flow_rate: float
     remarks: str = Field("", description="a hack for pandera")
 
@@ -86,13 +87,13 @@ class FlowBoundaryTime(BaseModel):
 class FractionalFlowStatic(BaseModel):
     node_id: int
     fraction: float
-    control_state: Optional[str] = None
+    control_state: str | None = None
     remarks: str = Field("", description="a hack for pandera")
 
 
 class LevelBoundaryStatic(BaseModel):
     node_id: int
-    active: Optional[bool] = None
+    active: bool | None = None
     level: float
     remarks: str = Field("", description="a hack for pandera")
 
@@ -106,20 +107,20 @@ class LevelBoundaryTime(BaseModel):
 
 class LinearResistanceStatic(BaseModel):
     node_id: int
-    active: Optional[bool] = None
+    active: bool | None = None
     resistance: float
-    control_state: Optional[str] = None
+    control_state: str | None = None
     remarks: str = Field("", description="a hack for pandera")
 
 
 class ManningResistanceStatic(BaseModel):
     node_id: int
-    active: Optional[bool] = None
+    active: bool | None = None
     length: float
     manning_n: float
     profile_width: float
     profile_slope: float
-    control_state: Optional[str] = None
+    control_state: str | None = None
     remarks: str = Field("", description="a hack for pandera")
 
 
@@ -127,30 +128,30 @@ class Node(BaseModel):
     fid: int
     name: str
     type: str
-    allocation_network_id: Optional[int] = None
+    allocation_network_id: int | None = None
     remarks: str = Field("", description="a hack for pandera")
 
 
 class OutletStatic(BaseModel):
     node_id: int
-    active: Optional[bool] = None
+    active: bool | None = None
     flow_rate: float
-    min_flow_rate: Optional[float] = None
-    max_flow_rate: Optional[float] = None
-    min_crest_level: Optional[float] = None
-    control_state: Optional[str] = None
+    min_flow_rate: float | None = None
+    max_flow_rate: float | None = None
+    min_crest_level: float | None = None
+    control_state: str | None = None
     remarks: str = Field("", description="a hack for pandera")
 
 
 class PidControlStatic(BaseModel):
     node_id: int
-    active: Optional[bool] = None
+    active: bool | None = None
     listen_node_id: int
     target: float
     proportional: float
     integral: float
     derivative: float
-    control_state: Optional[str] = None
+    control_state: str | None = None
     remarks: str = Field("", description="a hack for pandera")
 
 
@@ -162,26 +163,26 @@ class PidControlTime(BaseModel):
     proportional: float
     integral: float
     derivative: float
-    control_state: Optional[str] = None
+    control_state: str | None = None
     remarks: str = Field("", description="a hack for pandera")
 
 
 class PumpStatic(BaseModel):
     node_id: int
-    active: Optional[bool] = None
+    active: bool | None = None
     flow_rate: float
-    min_flow_rate: Optional[float] = None
-    max_flow_rate: Optional[float] = None
-    control_state: Optional[str] = None
+    min_flow_rate: float | None = None
+    max_flow_rate: float | None = None
+    control_state: str | None = None
     remarks: str = Field("", description="a hack for pandera")
 
 
 class TabulatedRatingCurveStatic(BaseModel):
     node_id: int
-    active: Optional[bool] = None
+    active: bool | None = None
     level: float
     discharge: float
-    control_state: Optional[str] = None
+    control_state: str | None = None
     remarks: str = Field("", description="a hack for pandera")
 
 
@@ -200,7 +201,7 @@ class TerminalStatic(BaseModel):
 
 class UserStatic(BaseModel):
     node_id: int
-    active: Optional[bool] = None
+    active: bool | None = None
     demand: float
     return_factor: float
     min_level: float
@@ -219,27 +220,27 @@ class UserTime(BaseModel):
 
 
 class Root(BaseModel):
-    BasinProfile: Optional[BasinProfile] = None
-    BasinState: Optional[BasinState] = None
-    BasinStatic: Optional[BasinStatic] = None
-    BasinTime: Optional[BasinTime] = None
-    DiscreteControlCondition: Optional[DiscreteControlCondition] = None
-    DiscreteControlLogic: Optional[DiscreteControlLogic] = None
-    Edge: Optional[Edge] = None
-    FlowBoundaryStatic: Optional[FlowBoundaryStatic] = None
-    FlowBoundaryTime: Optional[FlowBoundaryTime] = None
-    FractionalFlowStatic: Optional[FractionalFlowStatic] = None
-    LevelBoundaryStatic: Optional[LevelBoundaryStatic] = None
-    LevelBoundaryTime: Optional[LevelBoundaryTime] = None
-    LinearResistanceStatic: Optional[LinearResistanceStatic] = None
-    ManningResistanceStatic: Optional[ManningResistanceStatic] = None
-    Node: Optional[Node] = None
-    OutletStatic: Optional[OutletStatic] = None
-    PidControlStatic: Optional[PidControlStatic] = None
-    PidControlTime: Optional[PidControlTime] = None
-    PumpStatic: Optional[PumpStatic] = None
-    TabulatedRatingCurveStatic: Optional[TabulatedRatingCurveStatic] = None
-    TabulatedRatingCurveTime: Optional[TabulatedRatingCurveTime] = None
-    TerminalStatic: Optional[TerminalStatic] = None
-    UserStatic: Optional[UserStatic] = None
-    UserTime: Optional[UserTime] = None
+    basinprofile: BasinProfile | None = None
+    basinstate: BasinState | None = None
+    basinstatic: BasinStatic | None = None
+    basintime: BasinTime | None = None
+    discretecontrolcondition: DiscreteControlCondition | None = None
+    discretecontrollogic: DiscreteControlLogic | None = None
+    edge: Edge | None = None
+    flowboundarystatic: FlowBoundaryStatic | None = None
+    flowboundarytime: FlowBoundaryTime | None = None
+    fractionalflowstatic: FractionalFlowStatic | None = None
+    levelboundarystatic: LevelBoundaryStatic | None = None
+    levelboundarytime: LevelBoundaryTime | None = None
+    linearresistancestatic: LinearResistanceStatic | None = None
+    manningresistancestatic: ManningResistanceStatic | None = None
+    node: Node | None = None
+    outletstatic: OutletStatic | None = None
+    pidcontrolstatic: PidControlStatic | None = None
+    pidcontroltime: PidControlTime | None = None
+    pumpstatic: PumpStatic | None = None
+    tabulatedratingcurvestatic: TabulatedRatingCurveStatic | None = None
+    tabulatedratingcurvetime: TabulatedRatingCurveTime | None = None
+    terminalstatic: TerminalStatic | None = None
+    userstatic: UserStatic | None = None
+    usertime: UserTime | None = None
diff --git a/python/ribasim/ribasim/node_types/__init__.py b/python/ribasim/ribasim/node_types/__init__.py
deleted file mode 100644
index a202a0883..000000000
--- a/python/ribasim/ribasim/node_types/__init__.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from ribasim.node_types.basin import Basin
-from ribasim.node_types.discrete_control import DiscreteControl
-from ribasim.node_types.flow_boundary import FlowBoundary
-from ribasim.node_types.fractional_flow import FractionalFlow
-from ribasim.node_types.level_boundary import LevelBoundary
-from ribasim.node_types.linear_resistance import LinearResistance
-from ribasim.node_types.manning_resistance import ManningResistance
-from ribasim.node_types.outlet import Outlet
-from ribasim.node_types.pid_control import PidControl
-from ribasim.node_types.pump import Pump
-from ribasim.node_types.tabulated_rating_curve import TabulatedRatingCurve
-from ribasim.node_types.terminal import Terminal
-from ribasim.node_types.user import User
-
-__all__ = [
-    "Basin",
-    "FractionalFlow",
-    "LevelBoundary",
-    "LinearResistance",
-    "ManningResistance",
-    "Pump",
-    "Outlet",
-    "FlowBoundary",
-    "TabulatedRatingCurve",
-    "Terminal",
-    "DiscreteControl",
-    "PidControl",
-    "User",
-]
diff --git a/python/ribasim/ribasim/node_types/basin.py b/python/ribasim/ribasim/node_types/basin.py
deleted file mode 100644
index e87b7170b..000000000
--- a/python/ribasim/ribasim/node_types/basin.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from typing import Optional
-
-from pandera.typing import DataFrame
-
-from ribasim.input_base import TableModel
-from ribasim.schemas import (  # type: ignore
-    BasinProfileSchema,
-    BasinStateSchema,
-    BasinStaticSchema,
-    BasinTimeSchema,
-)
-
-__all__ = ("Basin",)
-
-
-class Basin(TableModel):
-    """
-    Input for a (sub-)basin: an area of land where all flowing surface water converges to a single point.
-
-    Parameters
-    ----------
-    profile : pandas.DataFrame
-        Table describing the geometry.
-    static : pandas.DataFrame, optional
-        Table describing the constant fluxes.
-    time : pandas.DataFrame, optional
-        Table describing the time-varying fluxes.
-    state : pandas.DataFrame, optional
-        Table describing the initial condition.
-    """
-
-    profile: DataFrame[BasinProfileSchema]
-    static: Optional[DataFrame[BasinStaticSchema]] = None
-    time: Optional[DataFrame[BasinTimeSchema]] = None
-    state: Optional[DataFrame[BasinStateSchema]] = None
-
-    def sort(self):
-        self.profile.sort_values(["node_id", "level"], ignore_index=True, inplace=True)
-        if self.static is not None:
-            self.static.sort_values("node_id", ignore_index=True, inplace=True)
-        if self.time is not None:
-            self.time.sort_values(["time", "node_id"], ignore_index=True, inplace=True)
-        if self.state is not None:
-            self.state.sort_values("node_id", ignore_index=True, inplace=True)
diff --git a/python/ribasim/ribasim/node_types/discrete_control.py b/python/ribasim/ribasim/node_types/discrete_control.py
deleted file mode 100644
index 99c3fe4b6..000000000
--- a/python/ribasim/ribasim/node_types/discrete_control.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from pandera.typing import DataFrame
-
-from ribasim.input_base import TableModel
-from ribasim.schemas import (  # type: ignore
-    DiscreteControlConditionSchema,
-    DiscreteControlLogicSchema,
-)
-
-__all__ = ("DiscreteControl",)
-
-
-class DiscreteControl(TableModel):
-    """
-    Defines the control logic.
-
-    Parameters
-    ----------
-    condition : pandas.DataFrame
-        Table with the information of control conditions.
-    logic : pandas.Dataframe
-        Table with the information of truth state to control state mapping.
-    """
-
-    condition: DataFrame[DiscreteControlConditionSchema]
-    logic: DataFrame[DiscreteControlLogicSchema]
diff --git a/python/ribasim/ribasim/node_types/flow_boundary.py b/python/ribasim/ribasim/node_types/flow_boundary.py
deleted file mode 100644
index e53520fd7..000000000
--- a/python/ribasim/ribasim/node_types/flow_boundary.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from typing import Optional
-
-from pandera.typing import DataFrame
-
-from ribasim.input_base import TableModel
-from ribasim.schemas import (  # type: ignore
-    FlowBoundaryStaticSchema,
-    FlowBoundaryTimeSchema,
-)
-
-__all__ = ("FlowBoundary",)
-
-
-class FlowBoundary(TableModel):
-    """
-    Sets a precribed flow like a one-sided pump.
-
-    Parameters
-    ----------
-    static : pandas.DataFrame
-        Table with the constant flows.
-    time : pandas.DataFrame
-        Table with time-varying flow rates.
-    """
-
-    static: Optional[DataFrame[FlowBoundaryStaticSchema]] = None
-    time: Optional[DataFrame[FlowBoundaryTimeSchema]] = None
-
-    def sort(self):
-        if self.static is not None:
-            self.static.sort_values("node_id", ignore_index=True, inplace=True)
-        if self.time is not None:
-            self.time.sort_values(["time", "node_id"], ignore_index=True, inplace=True)
diff --git a/python/ribasim/ribasim/node_types/fractional_flow.py b/python/ribasim/ribasim/node_types/fractional_flow.py
deleted file mode 100644
index e24eecde5..000000000
--- a/python/ribasim/ribasim/node_types/fractional_flow.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from pandera.typing import DataFrame
-
-from ribasim.input_base import TableModel
-from ribasim.schemas import FractionalFlowStaticSchema  # type: ignore
-
-__all__ = ("FractionalFlow",)
-
-
-class FractionalFlow(TableModel):
-    """
-    Receives a fraction of the flow. The fractions must sum to 1.0 for a furcation.
-
-    Parameters
-    ----------
-    static : pandas.DataFrame
-        Table with the constant flow fractions.
-    """
-
-    static: DataFrame[FractionalFlowStaticSchema]
diff --git a/python/ribasim/ribasim/node_types/level_boundary.py b/python/ribasim/ribasim/node_types/level_boundary.py
deleted file mode 100644
index 3437acf7b..000000000
--- a/python/ribasim/ribasim/node_types/level_boundary.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from typing import Optional
-
-from pandera.typing import DataFrame
-
-from ribasim.input_base import TableModel
-from ribasim.schemas import (  # type: ignore
-    LevelBoundaryStaticSchema,
-    LevelBoundaryTimeSchema,
-)
-
-__all__ = ("LevelBoundary",)
-
-
-class LevelBoundary(TableModel):
-    """
-    Stores water at a given level unaffected by flow, like an infinitely large basin.
-
-    Parameters
-    ----------
-    static : pandas.DataFrame
-        Table with the constant water levels.
-    """
-
-    static: Optional[DataFrame[LevelBoundaryStaticSchema]] = None
-    time: Optional[DataFrame[LevelBoundaryTimeSchema]] = None
-
-    def sort(self):
-        if self.static is not None:
-            self.static.sort_values("node_id", ignore_index=True, inplace=True)
-        if self.time is not None:
-            self.time.sort_values(["time", "node_id"], ignore_index=True, inplace=True)
diff --git a/python/ribasim/ribasim/node_types/linear_resistance.py b/python/ribasim/ribasim/node_types/linear_resistance.py
deleted file mode 100644
index ec93a53e1..000000000
--- a/python/ribasim/ribasim/node_types/linear_resistance.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from pandera.typing import DataFrame
-
-from ribasim.input_base import TableModel
-from ribasim.schemas import LinearResistanceStaticSchema  # type: ignore
-
-__all__ = ("LinearResistance",)
-
-
-class LinearResistance(TableModel):
-    """
-    Flow through this connection linearly depends on the level difference
-    between the two connected basins.
-
-    Parameters
-    ----------
-    static : pd.DataFrame
-        Table with the constant resistances.
-    """
-
-    static: DataFrame[LinearResistanceStaticSchema]
diff --git a/python/ribasim/ribasim/node_types/manning_resistance.py b/python/ribasim/ribasim/node_types/manning_resistance.py
deleted file mode 100644
index 50dc43fe3..000000000
--- a/python/ribasim/ribasim/node_types/manning_resistance.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from pandera.typing import DataFrame
-
-from ribasim.input_base import TableModel
-from ribasim.schemas import ManningResistanceStaticSchema  # type: ignore
-
-__all__ = ("ManningResistance",)
-
-
-class ManningResistance(TableModel):
-    """
-    Flow through this connection is estimated by conservation of energy and the
-    Manning-Gauckler formula to estimate friction losses.
-
-    Parameters
-    ----------
-    static : pd.DataFrame
-        Table with the constant Manning parameters.
-    """
-
-    static: DataFrame[ManningResistanceStaticSchema]
diff --git a/python/ribasim/ribasim/node_types/outlet.py b/python/ribasim/ribasim/node_types/outlet.py
deleted file mode 100644
index 46fb70c22..000000000
--- a/python/ribasim/ribasim/node_types/outlet.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from pandera.typing import DataFrame
-
-from ribasim.input_base import TableModel
-from ribasim.schemas import OutletStaticSchema  # type: ignore
-
-__all__ = ("Outlet",)
-
-
-class Outlet(TableModel):
-    """
-    Conducts water from a source node to a destination node.
-    The set flow rate will be used unless the intake storage is less than 10m3,
-    in which case the flow rate will be linearly reduced to 0 m3/s.
-    Negative flow rates are not supported.
-    Note that the intake must always be a Basin.
-
-    Parameters
-    ----------
-    static : pd.DataFrame
-        Table with constant flow rates.
-    """
-
-    static: DataFrame[OutletStaticSchema]
diff --git a/python/ribasim/ribasim/node_types/pid_control.py b/python/ribasim/ribasim/node_types/pid_control.py
deleted file mode 100644
index f70dbf3e3..000000000
--- a/python/ribasim/ribasim/node_types/pid_control.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from typing import Optional
-
-from pandera.typing import DataFrame
-
-from ribasim.input_base import TableModel
-from ribasim.schemas import PidControlStaticSchema, PidControlTimeSchema  # type: ignore
-
-__all__ = ("PidControl",)
-
-
-class PidControl(TableModel):
-    """
-    Controller based on PID (Proportional, integral, derivative) which
-    controls the level of a single basin with a pump.
-
-    Parameters
-    ----------
-    static: pandas.DataFrame
-        Table with data for this node type.
-    time : pandas.DataFrame, optional
-        Table with time-varying data for this node type.
-    """
-
-    static: Optional[DataFrame[PidControlStaticSchema]] = None
-    time: Optional[DataFrame[PidControlTimeSchema]] = None
-
-    class Config:
-        validate_assignment = True
-
-    def sort(self):
-        if self.static is not None:
-            self.static.sort_values("node_id", ignore_index=True, inplace=True)
-        if self.time is not None:
-            self.time.sort_values(["time", "node_id"], ignore_index=True, inplace=True)
diff --git a/python/ribasim/ribasim/node_types/pump.py b/python/ribasim/ribasim/node_types/pump.py
deleted file mode 100644
index d2a966a25..000000000
--- a/python/ribasim/ribasim/node_types/pump.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from pandera.typing import DataFrame
-
-from ribasim.input_base import TableModel
-from ribasim.schemas import PumpStaticSchema  # type: ignore
-
-__all__ = ("Pump",)
-
-
-class Pump(TableModel):
-    """
-    Pump water from a source node to a destination node.
-    The set flow rate will be pumped unless the intake storage is less than 10m3,
-    in which case the flow rate will be linearly reduced to 0 m3/s.
-    Negative flow rates are not supported.
-    Note that the intake must always be a Basin.
-
-    Parameters
-    ----------
-    static : pd.DataFrame
-        Table with constant flow rates.
-    """
-
-    static: DataFrame[PumpStaticSchema]
diff --git a/python/ribasim/ribasim/node_types/tabulated_rating_curve.py b/python/ribasim/ribasim/node_types/tabulated_rating_curve.py
deleted file mode 100644
index cb88f888d..000000000
--- a/python/ribasim/ribasim/node_types/tabulated_rating_curve.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from typing import Optional
-
-from pandera.typing import DataFrame
-
-from ribasim.input_base import TableModel
-from ribasim.schemas import (  # type: ignore
-    TabulatedRatingCurveStaticSchema,
-    TabulatedRatingCurveTimeSchema,
-)
-
-__all__ = ("TabulatedRatingCurve",)
-
-
-class TabulatedRatingCurve(TableModel):
-    """
-    Linearly interpolates discharge between a tabulation of level and discharge.
-
-    Parameters
-    ----------
-    static : pd.DataFrame
-        Table with constant rating curves.
-    time : pandas.DataFrame, optional
-        Table with time-varying rating curves.
-    """
-
-    static: Optional[DataFrame[TabulatedRatingCurveStaticSchema]] = None
-    time: Optional[DataFrame[TabulatedRatingCurveTimeSchema]] = None
-
-    def sort(self):
-        if self.static is not None:
-            self.static.sort_values(
-                ["node_id", "level"], ignore_index=True, inplace=True
-            )
-        if self.time is not None:
-            self.time.sort_values(
-                ["time", "node_id", "level"], ignore_index=True, inplace=True
-            )
diff --git a/python/ribasim/ribasim/node_types/terminal.py b/python/ribasim/ribasim/node_types/terminal.py
deleted file mode 100644
index 3eb47e2a2..000000000
--- a/python/ribasim/ribasim/node_types/terminal.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from pandera.typing import DataFrame
-
-from ribasim.input_base import TableModel
-from ribasim.schemas import TerminalStaticSchema  # type: ignore
-
-__all__ = ("Terminal",)
-
-
-class Terminal(TableModel):
-    """
-    Water sink without state or properties.
-
-    Parameters
-    ----------
-    static : pd.DataFrame
-        Table with only node IDs of this type.
-    """
-
-    static: DataFrame[TerminalStaticSchema]
diff --git a/python/ribasim/ribasim/node_types/user.py b/python/ribasim/ribasim/node_types/user.py
deleted file mode 100644
index 2dda210b5..000000000
--- a/python/ribasim/ribasim/node_types/user.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from typing import Optional
-
-import pandera as pa
-from pandera.engines.pandas_engine import PydanticModel
-from pandera.typing import DataFrame
-
-from ribasim import models
-from ribasim.input_base import TableModel
-
-__all__ = ("User",)
-
-
-class StaticSchema(pa.SchemaModel):
-    class Config:
-        """Config with dataframe-level data type."""
-
-        dtype = PydanticModel(models.UserStatic)
-
-
-class TimeSchema(pa.SchemaModel):
-    class Config:
-        """Config with dataframe-level data type."""
-
-        dtype = PydanticModel(models.UserTime)
-
-
-class User(TableModel):
-    """
-    User node type with demand and priority.
-
-    Parameters
-    ----------
-    static: pandas.DataFrame
-        table with static data for this node type.
-    time: pandas.DataFrame
-        table with static data for this node type (only demand can be transient).
-    """
-
-    static: Optional[DataFrame[StaticSchema]] = None
-    time: Optional[DataFrame[TimeSchema]] = None
-
-    class Config:
-        validate_assignment = True
-
-    def sort(self):
-        if self.static is not None:
-            self.static.sort_values(
-                ["node_id", "priority"], ignore_index=True, inplace=True
-            )
-        if self.time is not None:
-            self.time.sort_values(
-                ["node_id", "priority", "time"], ignore_index=True, inplace=True
-            )
diff --git a/python/ribasim/ribasim/schemas.py b/python/ribasim/ribasim/schemas.py
index c7c44ab0c..d8a859a43 100644
--- a/python/ribasim/ribasim/schemas.py
+++ b/python/ribasim/ribasim/schemas.py
@@ -22,7 +22,11 @@ def gen_schema(name, cls):
             "Config": type(
                 f"{cname}.Config",
                 (),
-                {"dtype": PydanticModel(cls), "coerce": True},
+                {
+                    "dtype": PydanticModel(cls),
+                    "coerce": True,
+                    "add_missing_columns": True,
+                },
             )
         },
     )
diff --git a/python/ribasim/ribasim/types.py b/python/ribasim/ribasim/types.py
index 5c7433399..407e07f53 100644
--- a/python/ribasim/ribasim/types.py
+++ b/python/ribasim/ribasim/types.py
@@ -1,6 +1,5 @@
 from os import PathLike
-from typing import Union
 
-FilePath = Union[str, PathLike[str]]
+FilePath = str | PathLike[str]
 
 __all__ = ()
diff --git a/python/ribasim/ribasim/utils.py b/python/ribasim/ribasim/utils.py
index 6a3db761e..4ab4b946a 100644
--- a/python/ribasim/ribasim/utils.py
+++ b/python/ribasim/ribasim/utils.py
@@ -1,78 +1,14 @@
-from typing import Any, Sequence, Tuple
-
-import numpy as np
-import shapely
-from numpy.typing import NDArray
-
-from ribasim.geometry.node import Node
-
-
-def geometry_from_connectivity(
-    node: Node, from_id: Sequence[int], to_id: Sequence[int]
-) -> NDArray[Any]:
-    """
-    Create edge shapely geometries from connectivities.
-
-    Parameters
-    ----------
-    node : Ribasim.Node
-    from_id : Sequence[int]
-        First node of every edge.
-    to_id : Sequence[int]
-        Second node of every edge.
-
-    Returns
-    -------
-    edge_geometry : np.ndarray
-        Array of shapely LineStrings.
-    """
-    geometry = node.static["geometry"]
-    from_points = shapely.get_coordinates(geometry.loc[from_id])
-    to_points = shapely.get_coordinates(geometry.loc[to_id])
-    n = len(from_points)
-    vertices = np.empty((n * 2, 2), dtype=from_points.dtype)
-    vertices[0::2, :] = from_points
-    vertices[1::2, :] = to_points
-    indices = np.repeat(np.arange(n), 2)
-    return shapely.linestrings(coords=vertices, indices=indices)
-
-
-def connectivity_from_geometry(
-    node: Node, lines: NDArray[Any]
-) -> Tuple[NDArray[Any], NDArray[Any]]:
-    """
-    Derive from_node_id and to_node_id for every edge in lines. LineStrings
-    may be used to connect multiple nodes in a sequence, but every linestring
-    vertex must also a node.
-
-    Parameters
-    ----------
-    node : Node
-    lines : np.ndarray
-        Array of shapely linestrings.
-
-    Returns
-    -------
-    from_node_id : np.ndarray of int
-    to_node_id : np.ndarray of int
-    """
-    node_index = node.static.index
-    node_xy = shapely.get_coordinates(node.static.geometry.values)
-    edge_xy = shapely.get_coordinates(lines)
-
-    xy = np.vstack([node_xy, edge_xy])
-    _, inverse = np.unique(xy, return_inverse=True, axis=0)
-    _, index, inverse = np.unique(xy, return_index=True, return_inverse=True, axis=0)
-    uniques_index = index[inverse]
-
-    node_node_id, edge_node_id = np.split(uniques_index, [len(node_xy)])
-    if not np.isin(edge_node_id, node_node_id).all():
-        raise ValueError(
-            "Edge lines contain coordinates that are not in the node layer. "
-            "Please ensure all edges are snapped to nodes exactly."
-        )
-
-    edge_node_id = edge_node_id.reshape((-1, 2))
-    from_id = node_index[edge_node_id[:, 0]].to_numpy()
-    to_id = node_index[edge_node_id[:, 1]].to_numpy()
-    return from_id, to_id
+from collections.abc import Sequence
+
+
+def prefix_column(
+    column: str, record_columns: Sequence[str], prefix: str = "meta_"
+) -> str:
+    """Prefix column name with `prefix` if not in record_columns."""
+    if (
+        len(record_columns) > 0
+        and column not in record_columns
+        and not column.startswith(prefix)
+    ):
+        column = f"{prefix}{column}"
+    return column
diff --git a/python/ribasim/tests/test_edge.py b/python/ribasim/tests/test_edge.py
index 7230dfe3a..ea41a575c 100644
--- a/python/ribasim/tests/test_edge.py
+++ b/python/ribasim/tests/test_edge.py
@@ -23,6 +23,7 @@ def test_validation(edge):
 
     with pytest.raises(ValidationError):
         df = gpd.GeoDataFrame(
-            data={"from_node_id": [1, 1], "to_node_id": [2, 3]}, geometry=[None, None]
+            data={"from_node_id": [1, 1], "to_node_id": [None, 3]},
+            geometry=[None, None],
         )
-        Edge(static=df)
+        Edge(df=df)
diff --git a/python/ribasim/tests/test_io.py b/python/ribasim/tests/test_io.py
index e821cb4e5..e06972e12 100644
--- a/python/ribasim/tests/test_io.py
+++ b/python/ribasim/tests/test_io.py
@@ -9,6 +9,8 @@
 
 def assert_equal(a, b):
     """Like pandas.testing.assert_frame_equal, but ignoring the index."""
+    if a is None and b is None:
+        return True
 
     # TODO support assert basic == model, ignoring the index for all but node
     a = a.reset_index(drop=True)
@@ -25,28 +27,28 @@ def assert_equal(a, b):
 def test_basic(basic, tmp_path):
     model_orig = basic
     model_orig.write(tmp_path / "basic")
-    model_loaded = ribasim.Model.from_toml(tmp_path / "basic/ribasim.toml")
+    model_loaded = ribasim.Model(filepath=tmp_path / "basic/ribasim.toml")
 
-    index_a = model_orig.node.static.index.to_numpy(int)
-    index_b = model_loaded.node.static.index.to_numpy(int)
+    index_a = model_orig.network.node.df.index.to_numpy(int)
+    index_b = model_loaded.network.node.df.index.to_numpy(int)
     assert_array_equal(index_a, index_b)
-    assert_equal(model_orig.node.static, model_loaded.node.static)
-    assert_equal(model_orig.edge.static, model_loaded.edge.static)
-    assert model_loaded.basin.time is None
+    assert_equal(model_orig.network.node.df, model_loaded.network.node.df)
+    assert_equal(model_orig.network.edge.df, model_loaded.network.edge.df)
+    assert model_loaded.basin.time.df is None
 
 
 def test_basic_transient(basic_transient, tmp_path):
     model_orig = basic_transient
     model_orig.write(tmp_path / "basic_transient")
-    model_loaded = ribasim.Model.from_toml(tmp_path / "basic_transient/ribasim.toml")
+    model_loaded = ribasim.Model(filepath=tmp_path / "basic_transient/ribasim.toml")
 
-    assert_equal(model_orig.node.static, model_loaded.node.static)
-    assert_equal(model_orig.edge.static, model_loaded.edge.static)
+    assert_equal(model_orig.network.node.df, model_loaded.network.node.df)
+    assert_equal(model_orig.network.edge.df, model_loaded.network.edge.df)
 
     time = model_loaded.basin.time
-    assert model_orig.basin.time.time[0] == time.time[0]
-    assert_equal(model_orig.basin.time, time)
-    assert time.shape == (1468, 8)
+    assert model_orig.basin.time.df.time[0] == time.df.time[0]
+    assert_equal(model_orig.basin.time.df, time.df)
+    assert time.df.shape == (1468, 8)
 
 
 def test_pydantic():
@@ -63,7 +65,14 @@ def test_repr():
 
     pump_1 = Pump(static=static_data)
 
-    assert (
-        repr(pump_1)
-        == "<ribasim.Pump>\n   static: DataFrame(rows=3)\n       (node_id, active, flow_rate, min_flow_rate,\n       max_flow_rate, control_state, remarks)"
+    assert repr(pump_1) == "Pump(static=TableModel[PumpStaticSchema]())"
+
+
+def test_extra_columns():
+    static_data = pd.DataFrame(
+        data={"node_id": [1, 2, 3], "flow_rate": [1.0, -1.0, 0.0], "id": [-1, -2, -3]}
     )
+
+    pump_1 = Pump(static=static_data)
+
+    assert "meta_id" in pump_1.static.df.columns
diff --git a/python/ribasim/tests/test_model.py b/python/ribasim/tests/test_model.py
index b3a1895ef..05d26c355 100644
--- a/python/ribasim/tests/test_model.py
+++ b/python/ribasim/tests/test_model.py
@@ -27,9 +27,10 @@ def test_solver():
         Solver(saveat="a")
 
 
+@pytest.mark.xfail(reason="Needs refactor")
 def test_invalid_node_type(basic):
     # Add entry with invalid node type
-    basic.node.static = basic.node.static._append(
+    basic.node.static = basic.node.df._append(
         {"type": "InvalidNodeType", "geometry": Point(0, 0)}, ignore_index=True
     )
 
@@ -44,42 +45,48 @@ def test_invalid_node_id(basic):
     model = basic
 
     # Add entry with invalid node ID
-    model.pump.static = model.pump.static._append(
+    df = model.pump.static.df._append(
         {"flow_rate": 1, "node_id": -1, "remarks": "", "active": True},
         ignore_index=True,
     )
+    # Currently can't handle mixed NaN and None in a DataFrame
+    df = df.where(pd.notna(df), None)
+    model.pump.static.df = df
 
     with pytest.raises(
         ValueError,
         match=re.escape("Node IDs must be positive integers, got [-1]."),
     ):
-        model.validate_model_node_field_IDs()
+        model.validate_model_node_field_ids()
 
 
+@pytest.mark.xfail(reason="Should be reimplemented by the .add() API.")
 def test_node_id_duplicate(basic):
     model = basic
 
     # Add duplicate node ID
-    model.pump.static = model.pump.static._append(
+    df = model.pump.static.df._append(
         {"flow_rate": 1, "node_id": 1, "remarks": "", "active": True}, ignore_index=True
     )
-
+    # Currently can't handle mixed NaN and None in a DataFrame
+    df = df.where(pd.notna(df), None)
+    model.pump.static.df = df
     with pytest.raises(
         ValueError,
         match=re.escape("These node IDs were assigned to multiple node types: [1]."),
     ):
-        model.validate_model_node_field_IDs()
+        model.validate_model_node_field_ids()
 
 
 def test_node_ids_misassigned(basic):
     model = basic
 
     # Misassign node IDs
-    model.pump.static.loc[0, "node_id"] = 8
-    model.fractional_flow.static.loc[1, "node_id"] = 7
+    model.pump.static.df.loc[0, "node_id"] = 8
+    model.fractional_flow.static.df.loc[1, "node_id"] = 7
 
-    with pytest.raises(ValueError, match="The node IDs in the field fractional_flow.+"):
-        model.validate_model_node_IDs()
+    with pytest.raises(ValueError, match="The node IDs in the field static.+"):
+        model.validate_model_node_ids()
 
 
 def test_node_ids_unsequential(basic):
@@ -95,13 +102,13 @@ def test_node_ids_unsequential(basic):
         }
     )
 
-    basin.static["node_id"] = [1, 3, 6, 1000]
+    basin.static.df["node_id"] = [1, 3, 6, 1000]
 
     with pytest.raises(ValueError) as excinfo:
-        model.validate_model_node_field_IDs()
+        model.validate_model_node_field_ids()
 
     assert (
-        "Expected node IDs from 1 to 17 (the number of rows in self.node.static). These node IDs are missing: {9}. These node IDs are unexpected: {1000}."
+        "Expected node IDs from 1 to 17 (the number of rows in self.network.node.df). These node IDs are missing: {9}. These node IDs are unexpected: {1000}."
         in str(excinfo.value)
     )
 
diff --git a/python/ribasim/tests/test_utils.py b/python/ribasim/tests/test_utils.py
index 7b8d78498..8d2e427b4 100644
--- a/python/ribasim/tests/test_utils.py
+++ b/python/ribasim/tests/test_utils.py
@@ -15,7 +15,7 @@ def test_utils():
     node_xy = gpd.points_from_xy(x=xy[:, 0], y=xy[:, 1])
 
     node = Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -26,11 +26,17 @@ def test_utils():
     from_id = np.array([1, 2], dtype=np.int64)
     to_id = np.array([2, 3], dtype=np.int64)
 
-    lines = utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     assert lines[0].equals(LineString([xy[from_id[0] - 1], xy[to_id[0] - 1]]))
     assert lines[1].equals(LineString([xy[from_id[1] - 1], xy[to_id[1] - 1]]))
 
-    from_id_, to_id_ = utils.connectivity_from_geometry(node, lines)
+    from_id_, to_id_ = node.connectivity_from_geometry(lines)
 
     assert_array_equal(from_id, from_id_)
     assert_array_equal(to_id, to_id_)
+
+
+def test_prefix_column():
+    assert utils.prefix_column("a", ["b"]) == "meta_a"
+    assert utils.prefix_column("meta_a", ["b"]) == "meta_a"
+    assert utils.prefix_column("a", ["a"]) == "a"
diff --git a/python/ribasim_testmodels/pyproject.toml b/python/ribasim_testmodels/pyproject.toml
index 6757e4258..e5cff4975 100644
--- a/python/ribasim_testmodels/pyproject.toml
+++ b/python/ribasim_testmodels/pyproject.toml
@@ -12,7 +12,7 @@ classifiers = [
     "Intended Audience :: Science/Research",
     "Topic :: Scientific/Engineering :: Hydrology",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = ["ribasim", "geopandas", "numpy", "pandas"]
 dynamic = ["version"]
 
diff --git a/python/ribasim_testmodels/ribasim_testmodels/__init__.py b/python/ribasim_testmodels/ribasim_testmodels/__init__.py
index 2a971871f..cf011a35d 100644
--- a/python/ribasim_testmodels/ribasim_testmodels/__init__.py
+++ b/python/ribasim_testmodels/ribasim_testmodels/__init__.py
@@ -1,6 +1,6 @@
 __version__ = "0.3.0"
 
-from typing import Callable, Dict
+from collections.abc import Callable
 
 import ribasim
 
@@ -82,7 +82,7 @@
 ]
 
 # provide a mapping from model name to its constructor, so we can iterate over all models
-constructors: Dict[str, Callable[[], ribasim.Model]] = {}
+constructors: dict[str, Callable[[], ribasim.Model]] = {}
 for model_name_model in __all__:
     model_name = model_name_model.removesuffix("_model")
     model_constructor = getattr(ribasim_testmodels, model_name_model)
diff --git a/python/ribasim_testmodels/ribasim_testmodels/allocation.py b/python/ribasim_testmodels/ribasim_testmodels/allocation.py
index b593a837b..f84d60441 100644
--- a/python/ribasim_testmodels/ribasim_testmodels/allocation.py
+++ b/python/ribasim_testmodels/ribasim_testmodels/allocation.py
@@ -22,7 +22,7 @@ def user_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -33,9 +33,9 @@ def user_model():
     # Setup the edges:
     from_id = np.array([1, 1, 2, 3], dtype=np.int64)
     to_id = np.array([2, 3, 4, 4], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -110,8 +110,7 @@ def user_model():
     solver = ribasim.Solver(algorithm="Tsit5")
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         user=user,
         terminal=terminal,
@@ -164,7 +163,7 @@ def subnetwork_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type, "allocation_network_id": 1},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -179,9 +178,9 @@ def subnetwork_model():
     to_id = np.array([2, 3, 4, 10, 5, 6, 7, 8, 11, 12, 13, 9, 2, 6, 8], dtype=np.int64)
     allocation_network_id = len(from_id) * [None]
     allocation_network_id[0] = 1
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -219,8 +218,8 @@ def subnetwork_model():
             data={
                 "node_id": 1,
                 "flow_rate": np.arange(10, 0, -1),
-                "time": [f"2020-{i}-1 00:00:00" for i in range(1, 11)],
-            }
+                "time": pd.to_datetime([f"2020-{i}-1 00:00:00" for i in range(1, 11)]),
+            },
         )
     )
 
@@ -268,8 +267,7 @@ def subnetwork_model():
     allocation = ribasim.Allocation(use_allocation=True, timestep=86400)
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         user=user,
         flow_boundary=flow_boundary,
@@ -346,7 +344,7 @@ def looped_subnetwork_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type, "allocation_network_id": 1},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -423,9 +421,9 @@ def looped_subnetwork_model():
         ],
         dtype=np.int64,
     )
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -517,8 +515,7 @@ def looped_subnetwork_model():
     )
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         flow_boundary=flow_boundary,
         user=user,
@@ -551,7 +548,7 @@ def minimal_subnetwork_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type, "allocation_network_id": 1},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -570,9 +567,9 @@ def minimal_subnetwork_model():
     )
     allocation_network_id = len(from_id) * [None]
     allocation_network_id[0] = 1
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -656,8 +653,10 @@ def minimal_subnetwork_model():
     allocation = ribasim.Allocation(use_allocation=True, timestep=86400)
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(
+            node=node,
+            edge=edge,
+        ),
         basin=basin,
         flow_boundary=flow_boundary,
         pump=pump,
diff --git a/python/ribasim_testmodels/ribasim_testmodels/backwater.py b/python/ribasim_testmodels/ribasim_testmodels/backwater.py
index 2a5ae844a..e9adc4f07 100644
--- a/python/ribasim_testmodels/ribasim_testmodels/backwater.py
+++ b/python/ribasim_testmodels/ribasim_testmodels/backwater.py
@@ -18,7 +18,7 @@ def backwater_model():
     n_basin = counts[0]
 
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(node_xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -29,9 +29,9 @@ def backwater_model():
     ids = np.arange(1, x.size + 1, dtype=np.int64)
     from_id = ids[:-1]
     to_id = ids[1:]
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -93,8 +93,7 @@ def backwater_model():
     )
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         level_boundary=level_boundary,
         flow_boundary=flow_boundary,
diff --git a/python/ribasim_testmodels/ribasim_testmodels/basic.py b/python/ribasim_testmodels/ribasim_testmodels/basic.py
index 708a26dd1..eceea3ce1 100644
--- a/python/ribasim_testmodels/ribasim_testmodels/basic.py
+++ b/python/ribasim_testmodels/ribasim_testmodels/basic.py
@@ -144,7 +144,7 @@ def basic_model() -> ribasim.Model:
     )
     node_xy = gpd.points_from_xy(x=xy[:, 0], y=xy[:, 1])
 
-    node_id, node_type = ribasim.Node.get_node_ids_and_types(
+    node_id, node_type = ribasim.Node.node_ids_and_types(
         basin,
         level_boundary,
         flow_boundary,
@@ -158,7 +158,7 @@ def basic_model() -> ribasim.Model:
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(node_id, name="fid"),
             geometry=node_xy,
@@ -173,9 +173,9 @@ def basic_model() -> ribasim.Model:
     to_id = np.array(
         [2, 3, 4, 5, 8, 6, 7, 9, 9, 10, 12, 3, 13, 14, 6, 1, 17], dtype=np.int64
     )
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -190,8 +190,10 @@ def basic_model() -> ribasim.Model:
 
     # Setup a model:
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(
+            node=node,
+            edge=edge,
+        ),
         basin=basin,
         level_boundary=level_boundary,
         flow_boundary=flow_boundary,
@@ -237,7 +239,7 @@ def basic_transient_model() -> ribasim.Model:
             "urban_runoff": 0.0,
         }
     )
-    basin_ids = model.basin.static["node_id"].to_numpy()
+    basin_ids = model.basin.static.df["node_id"].to_numpy()
     forcing = (
         pd.concat(
             [timeseries.assign(node_id=id) for id in basin_ids], ignore_index=True
@@ -256,7 +258,6 @@ def basic_transient_model() -> ribasim.Model:
 
     model.basin.time = forcing
     model.basin.state = state
-    model.logging = None
 
     return model
 
@@ -337,11 +338,11 @@ def tabulated_rating_curve_model() -> ribasim.Model:
     )
     node_xy = gpd.points_from_xy(x=xy[:, 0], y=xy[:, 1])
 
-    node_id, node_type = ribasim.Node.get_node_ids_and_types(basin, rating_curve)
+    node_id, node_type = ribasim.Node.node_ids_and_types(basin, rating_curve)
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(node_id, name="fid"),
             geometry=node_xy,
@@ -352,9 +353,9 @@ def tabulated_rating_curve_model() -> ribasim.Model:
     # Setup the edges:
     from_id = np.array([1, 1, 2, 3], dtype=np.int64)
     to_id = np.array([2, 3, 4, 4], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -367,8 +368,7 @@ def tabulated_rating_curve_model() -> ribasim.Model:
 
     # Setup a model:
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         tabulated_rating_curve=rating_curve,
         starttime="2020-01-01 00:00:00",
@@ -395,7 +395,7 @@ def outlet_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -406,9 +406,9 @@ def outlet_model():
     # Setup the edges:
     from_id = np.array([1, 2], dtype=np.int64)
     to_id = np.array([2, 3], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -470,8 +470,7 @@ def outlet_model():
     )
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         outlet=outlet,
         level_boundary=level_boundary,
diff --git a/python/ribasim_testmodels/ribasim_testmodels/bucket.py b/python/ribasim_testmodels/ribasim_testmodels/bucket.py
index f46b9931c..3d284ff9b 100644
--- a/python/ribasim_testmodels/ribasim_testmodels/bucket.py
+++ b/python/ribasim_testmodels/ribasim_testmodels/bucket.py
@@ -17,7 +17,7 @@ def bucket_model() -> ribasim.Model:
     node_type = ["Basin"]
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -28,9 +28,9 @@ def bucket_model() -> ribasim.Model:
     # Setup the dummy edges:
     from_id = np.array([], dtype=np.int64)
     to_id = np.array([], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -70,8 +70,7 @@ def bucket_model() -> ribasim.Model:
     basin = ribasim.Basin(profile=profile, static=static, state=state)
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         starttime="2020-01-01 00:00:00",
         endtime="2021-01-01 00:00:00",
diff --git a/python/ribasim_testmodels/ribasim_testmodels/discrete_control.py b/python/ribasim_testmodels/ribasim_testmodels/discrete_control.py
index 9c8acc9de..211a4d931 100644
--- a/python/ribasim_testmodels/ribasim_testmodels/discrete_control.py
+++ b/python/ribasim_testmodels/ribasim_testmodels/discrete_control.py
@@ -35,7 +35,7 @@ def pump_discrete_control_model() -> ribasim.Model:
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -49,9 +49,9 @@ def pump_discrete_control_model() -> ribasim.Model:
 
     edge_type = 4 * ["flow"] + 2 * ["control"]
 
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"from_node_id": from_id, "to_node_id": to_id, "edge_type": edge_type},
             geometry=lines,
             crs="EPSG:28992",
@@ -136,8 +136,7 @@ def pump_discrete_control_model() -> ribasim.Model:
 
     # Setup a model:
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         linear_resistance=linear_resistance,
         pump=pump,
@@ -174,7 +173,7 @@ def flow_condition_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -185,9 +184,9 @@ def flow_condition_model():
     # Setup the edges:
     from_id = np.array([1, 2, 3, 5], dtype=np.int64)
     to_id = np.array([2, 3, 4, 3], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -275,8 +274,7 @@ def flow_condition_model():
 
     # Setup a model:
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         pump=pump,
         flow_boundary=flow_boundary,
@@ -316,7 +314,7 @@ def level_boundary_condition_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -327,9 +325,9 @@ def level_boundary_condition_model():
     # Setup the edges:
     from_id = np.array([1, 2, 3, 4, 6], dtype=np.int64)
     to_id = np.array([2, 3, 4, 5, 4], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -422,8 +420,7 @@ def level_boundary_condition_model():
     )
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         outlet=outlet,
         level_boundary=level_boundary,
@@ -465,7 +462,7 @@ def tabulated_rating_curve_control_model() -> ribasim.Model:
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -476,9 +473,9 @@ def tabulated_rating_curve_control_model() -> ribasim.Model:
     # Setup the edges:
     from_id = np.array([1, 2, 4], dtype=np.int64)
     to_id = np.array([2, 3, 2], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -555,8 +552,7 @@ def tabulated_rating_curve_control_model() -> ribasim.Model:
 
     # Setup a model:
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         tabulated_rating_curve=rating_curve,
         terminal=terminal,
@@ -600,7 +596,7 @@ def level_setpoint_with_minmax_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -611,9 +607,9 @@ def level_setpoint_with_minmax_model():
     # Setup the edges:
     from_id = np.array([1, 3, 4, 2, 1, 5, 7, 7], dtype=np.int64)
     to_id = np.array([3, 4, 2, 1, 5, 6, 2, 3], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -695,8 +691,7 @@ def level_setpoint_with_minmax_model():
     discrete_control = ribasim.DiscreteControl(condition=condition, logic=logic)
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         pump=pump,
         level_boundary=level_boundary,
diff --git a/python/ribasim_testmodels/ribasim_testmodels/dutch_waterways.py b/python/ribasim_testmodels/ribasim_testmodels/dutch_waterways.py
index dc7cfffb3..e82e358f1 100644
--- a/python/ribasim_testmodels/ribasim_testmodels/dutch_waterways.py
+++ b/python/ribasim_testmodels/ribasim_testmodels/dutch_waterways.py
@@ -197,7 +197,7 @@ def dutch_waterways_model():
     discrete_control = ribasim.DiscreteControl(condition=condition, logic=logic)
 
     # Set up the nodes:
-    node_id, node_type = ribasim.Node.get_node_ids_and_types(
+    node_id, node_type = ribasim.Node.node_ids_and_types(
         basin,
         linear_resistance,
         pump,
@@ -260,7 +260,7 @@ def dutch_waterways_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type, "name": node_name},
             index=pd.Index(node_id, name="fid"),
             geometry=node_xy,
@@ -311,9 +311,9 @@ def dutch_waterways_model():
         "",  # 17 -> 9
     ]
 
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -327,8 +327,7 @@ def dutch_waterways_model():
     )
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         linear_resistance=linear_resistance,
         pump=pump,
diff --git a/python/ribasim_testmodels/ribasim_testmodels/equations.py b/python/ribasim_testmodels/ribasim_testmodels/equations.py
index 9c4be85d2..bbb678f11 100644
--- a/python/ribasim_testmodels/ribasim_testmodels/equations.py
+++ b/python/ribasim_testmodels/ribasim_testmodels/equations.py
@@ -21,7 +21,7 @@ def linear_resistance_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -32,9 +32,9 @@ def linear_resistance_model():
     # Setup the edges:
     from_id = np.array([1, 2], dtype=np.int64)
     to_id = np.array([2, 3], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -91,8 +91,7 @@ def linear_resistance_model():
 
     # Setup a model:
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         level_boundary=level_boundary,
         linear_resistance=linear_resistance,
@@ -118,7 +117,7 @@ def rating_curve_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -129,9 +128,9 @@ def rating_curve_model():
     # Setup the edges:
     from_id = np.array([1, 2], dtype=np.int64)
     to_id = np.array([2, 3], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -199,8 +198,7 @@ def rating_curve_model():
 
     # Setup a model:
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         terminal=terminal,
         tabulated_rating_curve=rating_curve,
@@ -228,7 +226,7 @@ def manning_resistance_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -239,9 +237,9 @@ def manning_resistance_model():
     # Setup the edges:
     from_id = np.array([1, 2], dtype=np.int64)
     to_id = np.array([2, 3], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -296,8 +294,7 @@ def manning_resistance_model():
 
     # Setup a model:
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         manning_resistance=manning_resistance,
         starttime="2020-01-01 00:00:00",
@@ -335,7 +332,7 @@ def misc_nodes_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -346,9 +343,9 @@ def misc_nodes_model():
     # Setup the edges:
     from_id = np.array([1, 2, 3, 4, 1, 6], dtype=np.int64)
     to_id = np.array([2, 3, 4, 5, 6, 7], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -436,8 +433,7 @@ def misc_nodes_model():
 
     # Setup a model:
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         flow_boundary=flow_boundary,
         pump=pump,
@@ -468,7 +464,7 @@ def pid_control_equation_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -479,9 +475,9 @@ def pid_control_equation_model():
     # Setup the edges:
     from_id = np.array([1, 2, 4], dtype=np.int64)
     to_id = np.array([2, 3, 2], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -555,8 +551,7 @@ def pid_control_equation_model():
     )
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         pump=pump,
         terminal=terminal,
diff --git a/python/ribasim_testmodels/ribasim_testmodels/invalid.py b/python/ribasim_testmodels/ribasim_testmodels/invalid.py
index c94860665..9158afb22 100644
--- a/python/ribasim_testmodels/ribasim_testmodels/invalid.py
+++ b/python/ribasim_testmodels/ribasim_testmodels/invalid.py
@@ -17,7 +17,7 @@ def invalid_qh_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -28,9 +28,9 @@ def invalid_qh_model():
     # Setup the edges:
     from_id = np.array([], dtype=np.int64)
     to_id = np.array([], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -85,8 +85,10 @@ def invalid_qh_model():
     )
 
     model = ribasim.Model(
-        edge=edge,
-        node=node,
+        network=ribasim.Network(
+            edge=edge,
+            node=node,
+        ),
         basin=basin,
         tabulated_rating_curve=rating_curve,
         starttime="2020-01-01 00:00:00",
@@ -122,7 +124,7 @@ def invalid_fractional_flow_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -134,9 +136,9 @@ def invalid_fractional_flow_model():
     # Invalid: Node #7 combines fractional flow outneighbors with other outneigbor types.
     from_id = np.array([1, 7, 7, 3, 7, 4], dtype=np.int64)
     to_id = np.array([7, 2, 3, 5, 4, 6], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -186,8 +188,7 @@ def invalid_fractional_flow_model():
     )
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         fractional_flow=fractional_flow,
         tabulated_rating_curve=rating_curve,
@@ -215,7 +216,7 @@ def invalid_discrete_control_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -226,9 +227,9 @@ def invalid_discrete_control_model():
     # Setup the edges:
     from_id = np.array([1, 2, 4, 5], dtype=np.int64)
     to_id = np.array([2, 3, 3, 2], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -314,8 +315,7 @@ def invalid_discrete_control_model():
     discrete_control = ribasim.DiscreteControl(condition=condition, logic=logic)
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         pump=pump,
         flow_boundary=flow_boundary,
@@ -344,7 +344,7 @@ def invalid_edge_types_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -355,9 +355,9 @@ def invalid_edge_types_model():
     # Setup the edges:
     from_id = np.array([1, 2], dtype=np.int64)
     to_id = np.array([2, 3], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -402,8 +402,7 @@ def invalid_edge_types_model():
 
     # Setup a model:
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         pump=pump,
         starttime="2020-01-01 00:00:00",
diff --git a/python/ribasim_testmodels/ribasim_testmodels/pid_control.py b/python/ribasim_testmodels/ribasim_testmodels/pid_control.py
index 367cfb3a2..865067e42 100644
--- a/python/ribasim_testmodels/ribasim_testmodels/pid_control.py
+++ b/python/ribasim_testmodels/ribasim_testmodels/pid_control.py
@@ -33,7 +33,7 @@ def pid_control_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -45,9 +45,9 @@ def pid_control_model():
     from_id = np.array([1, 2, 3, 4, 6, 5, 7], dtype=np.int64)
     to_id = np.array([2, 3, 4, 6, 2, 3, 6], dtype=np.int64)
 
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -144,8 +144,7 @@ def pid_control_model():
 
     # Setup a model:
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         flow_boundary=flow_boundary,
         level_boundary=level_boundary,
@@ -187,7 +186,7 @@ def discrete_control_of_pid_control_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -199,9 +198,9 @@ def discrete_control_of_pid_control_model():
     from_id = np.array([1, 2, 3, 4, 6, 7], dtype=np.int64)
     to_id = np.array([2, 3, 4, 5, 2, 6], dtype=np.int64)
 
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -318,8 +317,7 @@ def discrete_control_of_pid_control_model():
 
     # Setup a model:
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         outlet=outlet,
         tabulated_rating_curve=rating_curve,
diff --git a/python/ribasim_testmodels/ribasim_testmodels/time.py b/python/ribasim_testmodels/ribasim_testmodels/time.py
index a483df3f0..bb34dfea7 100644
--- a/python/ribasim_testmodels/ribasim_testmodels/time.py
+++ b/python/ribasim_testmodels/ribasim_testmodels/time.py
@@ -22,7 +22,7 @@ def flow_boundary_time_model():
 
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -33,9 +33,9 @@ def flow_boundary_time_model():
     # Setup the edges:
     from_id = np.array([1, 3], dtype=np.int64)
     to_id = np.array([2, 2], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -92,8 +92,7 @@ def flow_boundary_time_model():
     )
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(node=node, edge=edge),
         basin=basin,
         flow_boundary=flow_boundary,
         starttime="2020-01-01 00:00:00",
diff --git a/python/ribasim_testmodels/ribasim_testmodels/trivial.py b/python/ribasim_testmodels/ribasim_testmodels/trivial.py
index dcb00ee08..9524aa219 100644
--- a/python/ribasim_testmodels/ribasim_testmodels/trivial.py
+++ b/python/ribasim_testmodels/ribasim_testmodels/trivial.py
@@ -23,7 +23,7 @@ def trivial_model() -> ribasim.Model:
     ]
     # Make sure the feature id starts at 1: explicitly give an index.
     node = ribasim.Node(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={"type": node_type},
             index=pd.Index(np.arange(len(xy)) + 1, name="fid"),
             geometry=node_xy,
@@ -34,9 +34,9 @@ def trivial_model() -> ribasim.Model:
     # Setup the edges:
     from_id = np.array([1, 2], dtype=np.int64)
     to_id = np.array([2, 3], dtype=np.int64)
-    lines = ribasim.utils.geometry_from_connectivity(node, from_id, to_id)
+    lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
-        static=gpd.GeoDataFrame(
+        df=gpd.GeoDataFrame(
             data={
                 "from_node_id": from_id,
                 "to_node_id": to_id,
@@ -97,8 +97,10 @@ def trivial_model() -> ribasim.Model:
     )
 
     model = ribasim.Model(
-        node=node,
-        edge=edge,
+        network=ribasim.Network(
+            node=node,
+            edge=edge,
+        ),
         basin=basin,
         terminal=terminal,
         tabulated_rating_curve=rating_curve,
diff --git a/qgis/LICENSE b/ribasim_qgis/LICENSE
similarity index 100%
rename from qgis/LICENSE
rename to ribasim_qgis/LICENSE
diff --git a/qgis/__init__.py b/ribasim_qgis/__init__.py
similarity index 100%
rename from qgis/__init__.py
rename to ribasim_qgis/__init__.py
diff --git a/qgis/core/__init__.py b/ribasim_qgis/core/__init__.py
similarity index 100%
rename from qgis/core/__init__.py
rename to ribasim_qgis/core/__init__.py
diff --git a/qgis/core/geopackage.py b/ribasim_qgis/core/geopackage.py
similarity index 96%
rename from qgis/core/geopackage.py
rename to ribasim_qgis/core/geopackage.py
index 1af432c7b..4b549cec4 100644
--- a/qgis/core/geopackage.py
+++ b/ribasim_qgis/core/geopackage.py
@@ -10,7 +10,6 @@
 """
 import sqlite3
 from contextlib import contextmanager
-from typing import List
 
 from qgis import processing
 from qgis.core import QgsVectorFileWriter, QgsVectorLayer
@@ -27,7 +26,7 @@ def sqlite3_cursor(path):
         connection.close()
 
 
-def layers(path: str) -> List[str]:
+def layers(path: str) -> list[str]:
     """
     Return all layers that are present in the geopackage.
 
@@ -38,7 +37,7 @@ def layers(path: str) -> List[str]:
 
     Returns
     -------
-    layernames: List[str]
+    layernames: list[str]
     """
     with sqlite3_cursor(path) as cursor:
         cursor.execute("Select table_name from gpkg_contents")
diff --git a/qgis/core/nodes.py b/ribasim_qgis/core/nodes.py
similarity index 98%
rename from qgis/core/nodes.py
rename to ribasim_qgis/core/nodes.py
index 7812bd095..f79228f03 100644
--- a/qgis/core/nodes.py
+++ b/ribasim_qgis/core/nodes.py
@@ -21,12 +21,10 @@
 """
 
 import abc
-from typing import Any, Dict, List, Tuple
+from typing import Any
 
 from PyQt5.QtCore import Qt, QVariant
 from PyQt5.QtGui import QColor
-from ribasim_qgis.core import geopackage
-
 from qgis.core import (
     Qgis,
     QgsCategorizedSymbolRenderer,
@@ -43,6 +41,8 @@
     QgsVectorLayerSimpleLabeling,
 )
 
+from ribasim_qgis.core import geopackage
+
 
 class Input(abc.ABC):
     """Abstract base class for Ribasim input layers."""
@@ -63,7 +63,7 @@ def nodetype(cls):
         return cls.input_type.split("/")[0].strip()
 
     @classmethod
-    def create(cls, path: str, crs: Any, names: List[str]) -> "Input":
+    def create(cls, path: str, crs: Any, names: list[str]) -> "Input":
         instance = cls(path)
         if instance.name in names:
             raise ValueError(f"Name already exists in geopackage: {instance.name}")
@@ -108,7 +108,7 @@ def layer_from_geopackage(self) -> QgsVectorLayer:
         self.layer = QgsVectorLayer(f"{self.path}|layername={self.name}", self.name)
         return
 
-    def from_geopackage(self) -> Tuple[Any, Any]:
+    def from_geopackage(self) -> tuple[Any, Any]:
         self.layer_from_geopackage()
         return (self.layer, self.renderer, self.labels)
 
@@ -558,7 +558,7 @@ class UserTime(Input):
 EDGETYPES = {"flow", "control"}
 
 
-def load_nodes_from_geopackage(path: str) -> Dict[str, Input]:
+def load_nodes_from_geopackage(path: str) -> dict[str, Input]:
     # List the names in the geopackage
     gpkg_names = geopackage.layers(path)
     nodes = {}
diff --git a/qgis/core/topology.py b/ribasim_qgis/core/topology.py
similarity index 95%
rename from qgis/core/topology.py
rename to ribasim_qgis/core/topology.py
index a7090505a..70d739021 100644
--- a/qgis/core/topology.py
+++ b/ribasim_qgis/core/topology.py
@@ -1,7 +1,4 @@
-from typing import Tuple
-
 import numpy as np
-
 from qgis import processing
 from qgis.core import QgsVectorLayer
 from qgis.core.additions.edit import edit
@@ -32,7 +29,7 @@ def explode_lines(edge: QgsVectorLayer) -> None:
     return
 
 
-def derive_connectivity(node_index, node_xy, edge_xy) -> Tuple[np.ndarray, np.ndarray]:
+def derive_connectivity(node_index, node_xy, edge_xy) -> tuple[np.ndarray, np.ndarray]:
     """
     Derive connectivity on the basis of xy locations.
 
diff --git a/qgis/icon.png b/ribasim_qgis/icon.png
similarity index 100%
rename from qgis/icon.png
rename to ribasim_qgis/icon.png
diff --git a/qgis/metadata.txt b/ribasim_qgis/metadata.txt
similarity index 100%
rename from qgis/metadata.txt
rename to ribasim_qgis/metadata.txt
diff --git a/qgis/resources.py b/ribasim_qgis/resources.py
similarity index 99%
rename from qgis/resources.py
rename to ribasim_qgis/resources.py
index a87374c6b..6a557b860 100644
--- a/qgis/resources.py
+++ b/ribasim_qgis/resources.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Resource object code
 #
 # Created by: The Resource Compiler for PyQt5 (Qt v5.15.2)
diff --git a/qgis/resources.qrc b/ribasim_qgis/resources.qrc
similarity index 100%
rename from qgis/resources.qrc
rename to ribasim_qgis/resources.qrc
diff --git a/qgis/ribasim_qgis.py b/ribasim_qgis/ribasim_qgis.py
similarity index 100%
rename from qgis/ribasim_qgis.py
rename to ribasim_qgis/ribasim_qgis.py
diff --git a/qgis/tests/__init__.py b/ribasim_qgis/tests/__init__.py
similarity index 100%
rename from qgis/tests/__init__.py
rename to ribasim_qgis/tests/__init__.py
diff --git a/qgis/tests/test_load_plugin.py b/ribasim_qgis/tests/test_load_plugin.py
similarity index 100%
rename from qgis/tests/test_load_plugin.py
rename to ribasim_qgis/tests/test_load_plugin.py
diff --git a/ribasim_qgis/tomllib/__init__.py b/ribasim_qgis/tomllib/__init__.py
new file mode 100644
index 000000000..d7e0167a4
--- /dev/null
+++ b/ribasim_qgis/tomllib/__init__.py
@@ -0,0 +1,13 @@
+# Copied from https://github.com/python/cpython/blob/v3.12.0/Lib/tomllib/__init__.py
+# QGIS does not guarantee a toml reader
+
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2021 Taneli Hukkinen
+# Licensed to PSF under a Contributor Agreement.
+
+__all__ = ("loads", "load", "TOMLDecodeError")
+
+from ._parser import TOMLDecodeError, load, loads
+
+# Pretend this exception was created here.
+TOMLDecodeError.__module__ = __name__
diff --git a/ribasim_qgis/tomllib/_parser.py b/ribasim_qgis/tomllib/_parser.py
new file mode 100644
index 000000000..7c1eb0dc6
--- /dev/null
+++ b/ribasim_qgis/tomllib/_parser.py
@@ -0,0 +1,694 @@
+# Copied from https://github.com/python/cpython/blob/v3.12.0/Lib/tomllib/_parser.py
+# QGIS does not guarantee a toml reader
+
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2021 Taneli Hukkinen
+# Licensed to PSF under a Contributor Agreement.
+
+from __future__ import annotations
+
+from collections.abc import Iterable
+import string
+from types import MappingProxyType
+from typing import Any, BinaryIO, NamedTuple
+
+from ._re import (
+    RE_DATETIME,
+    RE_LOCALTIME,
+    RE_NUMBER,
+    match_to_datetime,
+    match_to_localtime,
+    match_to_number,
+)
+from ._types import Key, ParseFloat, Pos
+
+ASCII_CTRL = frozenset(chr(i) for i in range(32)) | frozenset(chr(127))
+
+# Neither of these sets include quotation mark or backslash. They are
+# currently handled as separate cases in the parser functions.
+ILLEGAL_BASIC_STR_CHARS = ASCII_CTRL - frozenset("\t")
+ILLEGAL_MULTILINE_BASIC_STR_CHARS = ASCII_CTRL - frozenset("\t\n")
+
+ILLEGAL_LITERAL_STR_CHARS = ILLEGAL_BASIC_STR_CHARS
+ILLEGAL_MULTILINE_LITERAL_STR_CHARS = ILLEGAL_MULTILINE_BASIC_STR_CHARS
+
+ILLEGAL_COMMENT_CHARS = ILLEGAL_BASIC_STR_CHARS
+
+TOML_WS = frozenset(" \t")
+TOML_WS_AND_NEWLINE = TOML_WS | frozenset("\n")
+BARE_KEY_CHARS = frozenset(string.ascii_letters + string.digits + "-_")
+KEY_INITIAL_CHARS = BARE_KEY_CHARS | frozenset("\"'")
+HEXDIGIT_CHARS = frozenset(string.hexdigits)
+
+BASIC_STR_ESCAPE_REPLACEMENTS = MappingProxyType(
+    {
+        "\\b": "\u0008",  # backspace
+        "\\t": "\u0009",  # tab
+        "\\n": "\u000A",  # linefeed
+        "\\f": "\u000C",  # form feed
+        "\\r": "\u000D",  # carriage return
+        '\\"': "\u0022",  # quote
+        "\\\\": "\u005C",  # backslash
+    }
+)
+
+
+class TOMLDecodeError(ValueError):
+    """An error raised if a document is not valid TOML."""
+
+
+def load(fp: BinaryIO, /, *, parse_float: ParseFloat = float) -> dict[str, Any]:
+    """Parse TOML from a binary file object."""
+    b = fp.read()
+    try:
+        s = b.decode()
+    except AttributeError:
+        raise TypeError(
+            "File must be opened in binary mode, e.g. use `open('foo.toml', 'rb')`"
+        ) from None
+    return loads(s, parse_float=parse_float)
+
+
+def loads(s: str, /, *, parse_float: ParseFloat = float) -> dict[str, Any]:  # noqa: C901
+    """Parse TOML from a string."""
+
+    # The spec allows converting "\r\n" to "\n", even in string
+    # literals. Let's do so to simplify parsing.
+    src = s.replace("\r\n", "\n")
+    pos = 0
+    out = Output(NestedDict(), Flags())
+    header: Key = ()
+    parse_float = make_safe_parse_float(parse_float)
+
+    # Parse one statement at a time
+    # (typically means one line in TOML source)
+    while True:
+        # 1. Skip line leading whitespace
+        pos = skip_chars(src, pos, TOML_WS)
+
+        # 2. Parse rules. Expect one of the following:
+        #    - end of file
+        #    - end of line
+        #    - comment
+        #    - key/value pair
+        #    - append dict to list (and move to its namespace)
+        #    - create dict (and move to its namespace)
+        # Skip trailing whitespace when applicable.
+        try:
+            char = src[pos]
+        except IndexError:
+            break
+        if char == "\n":
+            pos += 1
+            continue
+        if char in KEY_INITIAL_CHARS:
+            pos = key_value_rule(src, pos, out, header, parse_float)
+            pos = skip_chars(src, pos, TOML_WS)
+        elif char == "[":
+            try:
+                second_char: str | None = src[pos + 1]
+            except IndexError:
+                second_char = None
+            out.flags.finalize_pending()
+            if second_char == "[":
+                pos, header = create_list_rule(src, pos, out)
+            else:
+                pos, header = create_dict_rule(src, pos, out)
+            pos = skip_chars(src, pos, TOML_WS)
+        elif char != "#":
+            raise suffixed_err(src, pos, "Invalid statement")
+
+        # 3. Skip comment
+        pos = skip_comment(src, pos)
+
+        # 4. Expect end of line or end of file
+        try:
+            char = src[pos]
+        except IndexError:
+            break
+        if char != "\n":
+            raise suffixed_err(
+                src, pos, "Expected newline or end of document after a statement"
+            )
+        pos += 1
+
+    return out.data.dict
+
+
+class Flags:
+    """Flags that map to parsed keys/namespaces."""
+
+    # Marks an immutable namespace (inline array or inline table).
+    FROZEN = 0
+    # Marks a nest that has been explicitly created and can no longer
+    # be opened using the "[table]" syntax.
+    EXPLICIT_NEST = 1
+
+    def __init__(self) -> None:
+        self._flags: dict[str, dict] = {}
+        self._pending_flags: set[tuple[Key, int]] = set()
+
+    def add_pending(self, key: Key, flag: int) -> None:
+        self._pending_flags.add((key, flag))
+
+    def finalize_pending(self) -> None:
+        for key, flag in self._pending_flags:
+            self.set(key, flag, recursive=False)
+        self._pending_flags.clear()
+
+    def unset_all(self, key: Key) -> None:
+        cont = self._flags
+        for k in key[:-1]:
+            if k not in cont:
+                return
+            cont = cont[k]["nested"]
+        cont.pop(key[-1], None)
+
+    def set(self, key: Key, flag: int, *, recursive: bool) -> None:  # noqa: A003
+        cont = self._flags
+        key_parent, key_stem = key[:-1], key[-1]
+        for k in key_parent:
+            if k not in cont:
+                cont[k] = {"flags": set(), "recursive_flags": set(), "nested": {}}
+            cont = cont[k]["nested"]
+        if key_stem not in cont:
+            cont[key_stem] = {"flags": set(), "recursive_flags": set(), "nested": {}}
+        cont[key_stem]["recursive_flags" if recursive else "flags"].add(flag)
+
+    def is_(self, key: Key, flag: int) -> bool:
+        if not key:
+            return False  # document root has no flags
+        cont = self._flags
+        for k in key[:-1]:
+            if k not in cont:
+                return False
+            inner_cont = cont[k]
+            if flag in inner_cont["recursive_flags"]:
+                return True
+            cont = inner_cont["nested"]
+        key_stem = key[-1]
+        if key_stem in cont:
+            cont = cont[key_stem]
+            return flag in cont["flags"] or flag in cont["recursive_flags"]
+        return False
+
+
+class NestedDict:
+    def __init__(self) -> None:
+        # The parsed content of the TOML document
+        self.dict: dict[str, Any] = {}
+
+    def get_or_create_nest(
+        self,
+        key: Key,
+        *,
+        access_lists: bool = True,
+    ) -> dict:
+        cont: Any = self.dict
+        for k in key:
+            if k not in cont:
+                cont[k] = {}
+            cont = cont[k]
+            if access_lists and isinstance(cont, list):
+                cont = cont[-1]
+            if not isinstance(cont, dict):
+                raise KeyError("There is no nest behind this key")
+        return cont
+
+    def append_nest_to_list(self, key: Key) -> None:
+        cont = self.get_or_create_nest(key[:-1])
+        last_key = key[-1]
+        if last_key in cont:
+            list_ = cont[last_key]
+            if not isinstance(list_, list):
+                raise KeyError("An object other than list found behind this key")
+            list_.append({})
+        else:
+            cont[last_key] = [{}]
+
+
+class Output(NamedTuple):
+    data: NestedDict
+    flags: Flags
+
+
+def skip_chars(src: str, pos: Pos, chars: Iterable[str]) -> Pos:
+    try:
+        while src[pos] in chars:
+            pos += 1
+    except IndexError:
+        pass
+    return pos
+
+
+def skip_until(
+    src: str,
+    pos: Pos,
+    expect: str,
+    *,
+    error_on: frozenset[str],
+    error_on_eof: bool,
+) -> Pos:
+    try:
+        new_pos = src.index(expect, pos)
+    except ValueError:
+        new_pos = len(src)
+        if error_on_eof:
+            raise suffixed_err(src, new_pos, f"Expected {expect!r}") from None
+
+    if not error_on.isdisjoint(src[pos:new_pos]):
+        while src[pos] not in error_on:
+            pos += 1
+        raise suffixed_err(src, pos, f"Found invalid character {src[pos]!r}")
+    return new_pos
+
+
+def skip_comment(src: str, pos: Pos) -> Pos:
+    try:
+        char: str | None = src[pos]
+    except IndexError:
+        char = None
+    if char == "#":
+        return skip_until(
+            src, pos + 1, "\n", error_on=ILLEGAL_COMMENT_CHARS, error_on_eof=False
+        )
+    return pos
+
+
+def skip_comments_and_array_ws(src: str, pos: Pos) -> Pos:
+    while True:
+        pos_before_skip = pos
+        pos = skip_chars(src, pos, TOML_WS_AND_NEWLINE)
+        pos = skip_comment(src, pos)
+        if pos == pos_before_skip:
+            return pos
+
+
+def create_dict_rule(src: str, pos: Pos, out: Output) -> tuple[Pos, Key]:
+    pos += 1  # Skip "["
+    pos = skip_chars(src, pos, TOML_WS)
+    pos, key = parse_key(src, pos)
+
+    if out.flags.is_(key, Flags.EXPLICIT_NEST) or out.flags.is_(key, Flags.FROZEN):
+        raise suffixed_err(src, pos, f"Cannot declare {key} twice")
+    out.flags.set(key, Flags.EXPLICIT_NEST, recursive=False)
+    try:
+        out.data.get_or_create_nest(key)
+    except KeyError:
+        raise suffixed_err(src, pos, "Cannot overwrite a value") from None
+
+    if not src.startswith("]", pos):
+        raise suffixed_err(src, pos, "Expected ']' at the end of a table declaration")
+    return pos + 1, key
+
+
+def create_list_rule(src: str, pos: Pos, out: Output) -> tuple[Pos, Key]:
+    pos += 2  # Skip "[["
+    pos = skip_chars(src, pos, TOML_WS)
+    pos, key = parse_key(src, pos)
+
+    if out.flags.is_(key, Flags.FROZEN):
+        raise suffixed_err(src, pos, f"Cannot mutate immutable namespace {key}")
+    # Free the namespace now that it points to another empty list item...
+    out.flags.unset_all(key)
+    # ...but this key precisely is still prohibited from table declaration
+    out.flags.set(key, Flags.EXPLICIT_NEST, recursive=False)
+    try:
+        out.data.append_nest_to_list(key)
+    except KeyError:
+        raise suffixed_err(src, pos, "Cannot overwrite a value") from None
+
+    if not src.startswith("]]", pos):
+        raise suffixed_err(src, pos, "Expected ']]' at the end of an array declaration")
+    return pos + 2, key
+
+
+def key_value_rule(
+    src: str, pos: Pos, out: Output, header: Key, parse_float: ParseFloat
+) -> Pos:
+    pos, key, value = parse_key_value_pair(src, pos, parse_float)
+    key_parent, key_stem = key[:-1], key[-1]
+    abs_key_parent = header + key_parent
+
+    relative_path_cont_keys = (header + key[:i] for i in range(1, len(key)))
+    for cont_key in relative_path_cont_keys:
+        # Check that dotted key syntax does not redefine an existing table
+        if out.flags.is_(cont_key, Flags.EXPLICIT_NEST):
+            raise suffixed_err(src, pos, f"Cannot redefine namespace {cont_key}")
+        # Containers in the relative path can't be opened with the table syntax or
+        # dotted key/value syntax in following table sections.
+        out.flags.add_pending(cont_key, Flags.EXPLICIT_NEST)
+
+    if out.flags.is_(abs_key_parent, Flags.FROZEN):
+        raise suffixed_err(
+            src, pos, f"Cannot mutate immutable namespace {abs_key_parent}"
+        )
+
+    try:
+        nest = out.data.get_or_create_nest(abs_key_parent)
+    except KeyError:
+        raise suffixed_err(src, pos, "Cannot overwrite a value") from None
+    if key_stem in nest:
+        raise suffixed_err(src, pos, "Cannot overwrite a value")
+    # Mark inline table and array namespaces recursively immutable
+    if isinstance(value, (dict, list)):
+        out.flags.set(header + key, Flags.FROZEN, recursive=True)
+    nest[key_stem] = value
+    return pos
+
+
+def parse_key_value_pair(
+    src: str, pos: Pos, parse_float: ParseFloat
+) -> tuple[Pos, Key, Any]:
+    pos, key = parse_key(src, pos)
+    try:
+        char: str | None = src[pos]
+    except IndexError:
+        char = None
+    if char != "=":
+        raise suffixed_err(src, pos, "Expected '=' after a key in a key/value pair")
+    pos += 1
+    pos = skip_chars(src, pos, TOML_WS)
+    pos, value = parse_value(src, pos, parse_float)
+    return pos, key, value
+
+
+def parse_key(src: str, pos: Pos) -> tuple[Pos, Key]:
+    pos, key_part = parse_key_part(src, pos)
+    key: Key = (key_part,)
+    pos = skip_chars(src, pos, TOML_WS)
+    while True:
+        try:
+            char: str | None = src[pos]
+        except IndexError:
+            char = None
+        if char != ".":
+            return pos, key
+        pos += 1
+        pos = skip_chars(src, pos, TOML_WS)
+        pos, key_part = parse_key_part(src, pos)
+        key += (key_part,)
+        pos = skip_chars(src, pos, TOML_WS)
+
+
+def parse_key_part(src: str, pos: Pos) -> tuple[Pos, str]:
+    try:
+        char: str | None = src[pos]
+    except IndexError:
+        char = None
+    if char in BARE_KEY_CHARS:
+        start_pos = pos
+        pos = skip_chars(src, pos, BARE_KEY_CHARS)
+        return pos, src[start_pos:pos]
+    if char == "'":
+        return parse_literal_str(src, pos)
+    if char == '"':
+        return parse_one_line_basic_str(src, pos)
+    raise suffixed_err(src, pos, "Invalid initial character for a key part")
+
+
+def parse_one_line_basic_str(src: str, pos: Pos) -> tuple[Pos, str]:
+    pos += 1
+    return parse_basic_str(src, pos, multiline=False)
+
+
+def parse_array(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos, list]:
+    pos += 1
+    array: list = []
+
+    pos = skip_comments_and_array_ws(src, pos)
+    if src.startswith("]", pos):
+        return pos + 1, array
+    while True:
+        pos, val = parse_value(src, pos, parse_float)
+        array.append(val)
+        pos = skip_comments_and_array_ws(src, pos)
+
+        c = src[pos : pos + 1]
+        if c == "]":
+            return pos + 1, array
+        if c != ",":
+            raise suffixed_err(src, pos, "Unclosed array")
+        pos += 1
+
+        pos = skip_comments_and_array_ws(src, pos)
+        if src.startswith("]", pos):
+            return pos + 1, array
+
+
+def parse_inline_table(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos, dict]:
+    pos += 1
+    nested_dict = NestedDict()
+    flags = Flags()
+
+    pos = skip_chars(src, pos, TOML_WS)
+    if src.startswith("}", pos):
+        return pos + 1, nested_dict.dict
+    while True:
+        pos, key, value = parse_key_value_pair(src, pos, parse_float)
+        key_parent, key_stem = key[:-1], key[-1]
+        if flags.is_(key, Flags.FROZEN):
+            raise suffixed_err(src, pos, f"Cannot mutate immutable namespace {key}")
+        try:
+            nest = nested_dict.get_or_create_nest(key_parent, access_lists=False)
+        except KeyError:
+            raise suffixed_err(src, pos, "Cannot overwrite a value") from None
+        if key_stem in nest:
+            raise suffixed_err(src, pos, f"Duplicate inline table key {key_stem!r}")
+        nest[key_stem] = value
+        pos = skip_chars(src, pos, TOML_WS)
+        c = src[pos : pos + 1]
+        if c == "}":
+            return pos + 1, nested_dict.dict
+        if c != ",":
+            raise suffixed_err(src, pos, "Unclosed inline table")
+        if isinstance(value, (dict, list)):
+            flags.set(key, Flags.FROZEN, recursive=True)
+        pos += 1
+        pos = skip_chars(src, pos, TOML_WS)
+
+
+def parse_basic_str_escape(
+    src: str, pos: Pos, *, multiline: bool = False
+) -> tuple[Pos, str]:
+    escape_id = src[pos : pos + 2]
+    pos += 2
+    if multiline and escape_id in {"\\ ", "\\\t", "\\\n"}:
+        # Skip whitespace until next non-whitespace character or end of
+        # the doc. Error if non-whitespace is found before newline.
+        if escape_id != "\\\n":
+            pos = skip_chars(src, pos, TOML_WS)
+            try:
+                char = src[pos]
+            except IndexError:
+                return pos, ""
+            if char != "\n":
+                raise suffixed_err(src, pos, "Unescaped '\\' in a string")
+            pos += 1
+        pos = skip_chars(src, pos, TOML_WS_AND_NEWLINE)
+        return pos, ""
+    if escape_id == "\\u":
+        return parse_hex_char(src, pos, 4)
+    if escape_id == "\\U":
+        return parse_hex_char(src, pos, 8)
+    try:
+        return pos, BASIC_STR_ESCAPE_REPLACEMENTS[escape_id]
+    except KeyError:
+        raise suffixed_err(src, pos, "Unescaped '\\' in a string") from None
+
+
+def parse_basic_str_escape_multiline(src: str, pos: Pos) -> tuple[Pos, str]:
+    return parse_basic_str_escape(src, pos, multiline=True)
+
+
+def parse_hex_char(src: str, pos: Pos, hex_len: int) -> tuple[Pos, str]:
+    hex_str = src[pos : pos + hex_len]
+    if len(hex_str) != hex_len or not HEXDIGIT_CHARS.issuperset(hex_str):
+        raise suffixed_err(src, pos, "Invalid hex value")
+    pos += hex_len
+    hex_int = int(hex_str, 16)
+    if not is_unicode_scalar_value(hex_int):
+        raise suffixed_err(src, pos, "Escaped character is not a Unicode scalar value")
+    return pos, chr(hex_int)
+
+
+def parse_literal_str(src: str, pos: Pos) -> tuple[Pos, str]:
+    pos += 1  # Skip starting apostrophe
+    start_pos = pos
+    pos = skip_until(
+        src, pos, "'", error_on=ILLEGAL_LITERAL_STR_CHARS, error_on_eof=True
+    )
+    return pos + 1, src[start_pos:pos]  # Skip ending apostrophe
+
+
+def parse_multiline_str(src: str, pos: Pos, *, literal: bool) -> tuple[Pos, str]:
+    pos += 3
+    if src.startswith("\n", pos):
+        pos += 1
+
+    if literal:
+        delim = "'"
+        end_pos = skip_until(
+            src,
+            pos,
+            "'''",
+            error_on=ILLEGAL_MULTILINE_LITERAL_STR_CHARS,
+            error_on_eof=True,
+        )
+        result = src[pos:end_pos]
+        pos = end_pos + 3
+    else:
+        delim = '"'
+        pos, result = parse_basic_str(src, pos, multiline=True)
+
+    # Add at maximum two extra apostrophes/quotes if the end sequence
+    # is 4 or 5 chars long instead of just 3.
+    if not src.startswith(delim, pos):
+        return pos, result
+    pos += 1
+    if not src.startswith(delim, pos):
+        return pos, result + delim
+    pos += 1
+    return pos, result + (delim * 2)
+
+
+def parse_basic_str(src: str, pos: Pos, *, multiline: bool) -> tuple[Pos, str]:
+    if multiline:
+        error_on = ILLEGAL_MULTILINE_BASIC_STR_CHARS
+        parse_escapes = parse_basic_str_escape_multiline
+    else:
+        error_on = ILLEGAL_BASIC_STR_CHARS
+        parse_escapes = parse_basic_str_escape
+    result = ""
+    start_pos = pos
+    while True:
+        try:
+            char = src[pos]
+        except IndexError:
+            raise suffixed_err(src, pos, "Unterminated string") from None
+        if char == '"':
+            if not multiline:
+                return pos + 1, result + src[start_pos:pos]
+            if src.startswith('"""', pos):
+                return pos + 3, result + src[start_pos:pos]
+            pos += 1
+            continue
+        if char == "\\":
+            result += src[start_pos:pos]
+            pos, parsed_escape = parse_escapes(src, pos)
+            result += parsed_escape
+            start_pos = pos
+            continue
+        if char in error_on:
+            raise suffixed_err(src, pos, f"Illegal character {char!r}")
+        pos += 1
+
+
+def parse_value(  # noqa: C901
+    src: str, pos: Pos, parse_float: ParseFloat
+) -> tuple[Pos, Any]:
+    try:
+        char: str | None = src[pos]
+    except IndexError:
+        char = None
+
+    # IMPORTANT: order conditions based on speed of checking and likelihood
+
+    # Basic strings
+    if char == '"':
+        if src.startswith('"""', pos):
+            return parse_multiline_str(src, pos, literal=False)
+        return parse_one_line_basic_str(src, pos)
+
+    # Literal strings
+    if char == "'":
+        if src.startswith("'''", pos):
+            return parse_multiline_str(src, pos, literal=True)
+        return parse_literal_str(src, pos)
+
+    # Booleans
+    if char == "t":
+        if src.startswith("true", pos):
+            return pos + 4, True
+    if char == "f":
+        if src.startswith("false", pos):
+            return pos + 5, False
+
+    # Arrays
+    if char == "[":
+        return parse_array(src, pos, parse_float)
+
+    # Inline tables
+    if char == "{":
+        return parse_inline_table(src, pos, parse_float)
+
+    # Dates and times
+    datetime_match = RE_DATETIME.match(src, pos)
+    if datetime_match:
+        try:
+            datetime_obj = match_to_datetime(datetime_match)
+        except ValueError as e:
+            raise suffixed_err(src, pos, "Invalid date or datetime") from e
+        return datetime_match.end(), datetime_obj
+    localtime_match = RE_LOCALTIME.match(src, pos)
+    if localtime_match:
+        return localtime_match.end(), match_to_localtime(localtime_match)
+
+    # Integers and "normal" floats.
+    # The regex will greedily match any type starting with a decimal
+    # char, so needs to be located after handling of dates and times.
+    number_match = RE_NUMBER.match(src, pos)
+    if number_match:
+        return number_match.end(), match_to_number(number_match, parse_float)
+
+    # Special floats
+    first_three = src[pos : pos + 3]
+    if first_three in {"inf", "nan"}:
+        return pos + 3, parse_float(first_three)
+    first_four = src[pos : pos + 4]
+    if first_four in {"-inf", "+inf", "-nan", "+nan"}:
+        return pos + 4, parse_float(first_four)
+
+    raise suffixed_err(src, pos, "Invalid value")
+
+
+def suffixed_err(src: str, pos: Pos, msg: str) -> TOMLDecodeError:
+    """Return a `TOMLDecodeError` where error message is suffixed with
+    coordinates in source."""
+
+    def coord_repr(src: str, pos: Pos) -> str:
+        if pos >= len(src):
+            return "end of document"
+        line = src.count("\n", 0, pos) + 1
+        if line == 1:
+            column = pos + 1
+        else:
+            column = pos - src.rindex("\n", 0, pos)
+        return f"line {line}, column {column}"
+
+    return TOMLDecodeError(f"{msg} (at {coord_repr(src, pos)})")
+
+
+def is_unicode_scalar_value(codepoint: int) -> bool:
+    return (0 <= codepoint <= 55295) or (57344 <= codepoint <= 1114111)
+
+
+def make_safe_parse_float(parse_float: ParseFloat) -> ParseFloat:
+    """A decorator to make `parse_float` safe.
+
+    `parse_float` must not return dicts or lists, because these types
+    would be mixed with parsed TOML tables and arrays, thus confusing
+    the parser. The returned decorated callable raises `ValueError`
+    instead of returning illegal types.
+    """
+    # The default `float` callable never returns illegal types. Optimize it.
+    if parse_float is float:  # type: ignore[comparison-overlap]
+        return float
+
+    def safe_parse_float(float_str: str) -> Any:
+        float_value = parse_float(float_str)
+        if isinstance(float_value, (dict, list)):
+            raise ValueError("parse_float must not return dicts or lists")
+        return float_value
+
+    return safe_parse_float
diff --git a/ribasim_qgis/tomllib/_re.py b/ribasim_qgis/tomllib/_re.py
new file mode 100644
index 000000000..b48d89c72
--- /dev/null
+++ b/ribasim_qgis/tomllib/_re.py
@@ -0,0 +1,110 @@
+# Copied from https://github.com/python/cpython/blob/v3.12.0/Lib/tomllib/_re.py
+# QGIS does not guarantee a toml reader
+
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2021 Taneli Hukkinen
+# Licensed to PSF under a Contributor Agreement.
+
+from __future__ import annotations
+
+from datetime import date, datetime, time, timedelta, timezone, tzinfo
+from functools import lru_cache
+import re
+from typing import Any
+
+from ._types import ParseFloat
+
+# E.g.
+# - 00:32:00.999999
+# - 00:32:00
+_TIME_RE_STR = r"([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])(?:\.([0-9]{1,6})[0-9]*)?"
+
+RE_NUMBER = re.compile(
+    r"""
+0
+(?:
+    x[0-9A-Fa-f](?:_?[0-9A-Fa-f])*   # hex
+    |
+    b[01](?:_?[01])*                 # bin
+    |
+    o[0-7](?:_?[0-7])*               # oct
+)
+|
+[+-]?(?:0|[1-9](?:_?[0-9])*)         # dec, integer part
+(?P<floatpart>
+    (?:\.[0-9](?:_?[0-9])*)?         # optional fractional part
+    (?:[eE][+-]?[0-9](?:_?[0-9])*)?  # optional exponent part
+)
+""",
+    flags=re.VERBOSE,
+)
+RE_LOCALTIME = re.compile(_TIME_RE_STR)
+RE_DATETIME = re.compile(
+    rf"""
+([0-9]{{4}})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])  # date, e.g. 1988-10-27
+(?:
+    [Tt ]
+    {_TIME_RE_STR}
+    (?:([Zz])|([+-])([01][0-9]|2[0-3]):([0-5][0-9]))?  # optional time offset
+)?
+""",
+    flags=re.VERBOSE,
+)
+
+
+def match_to_datetime(match: re.Match) -> datetime | date:
+    """Convert a `RE_DATETIME` match to `datetime.datetime` or `datetime.date`.
+
+    Raises ValueError if the match does not correspond to a valid date
+    or datetime.
+    """
+    (
+        year_str,
+        month_str,
+        day_str,
+        hour_str,
+        minute_str,
+        sec_str,
+        micros_str,
+        zulu_time,
+        offset_sign_str,
+        offset_hour_str,
+        offset_minute_str,
+    ) = match.groups()
+    year, month, day = int(year_str), int(month_str), int(day_str)
+    if hour_str is None:
+        return date(year, month, day)
+    hour, minute, sec = int(hour_str), int(minute_str), int(sec_str)
+    micros = int(micros_str.ljust(6, "0")) if micros_str else 0
+    if offset_sign_str:
+        tz: tzinfo | None = cached_tz(
+            offset_hour_str, offset_minute_str, offset_sign_str
+        )
+    elif zulu_time:
+        tz = timezone.utc
+    else:  # local date-time
+        tz = None
+    return datetime(year, month, day, hour, minute, sec, micros, tzinfo=tz)
+
+
+@lru_cache(maxsize=None)
+def cached_tz(hour_str: str, minute_str: str, sign_str: str) -> timezone:
+    sign = 1 if sign_str == "+" else -1
+    return timezone(
+        timedelta(
+            hours=sign * int(hour_str),
+            minutes=sign * int(minute_str),
+        )
+    )
+
+
+def match_to_localtime(match: re.Match) -> time:
+    hour_str, minute_str, sec_str, micros_str = match.groups()
+    micros = int(micros_str.ljust(6, "0")) if micros_str else 0
+    return time(int(hour_str), int(minute_str), int(sec_str), micros)
+
+
+def match_to_number(match: re.Match, parse_float: ParseFloat) -> Any:
+    if match.group("floatpart"):
+        return parse_float(match.group())
+    return int(match.group(), 0)
diff --git a/ribasim_qgis/tomllib/_types.py b/ribasim_qgis/tomllib/_types.py
new file mode 100644
index 000000000..775a153c1
--- /dev/null
+++ b/ribasim_qgis/tomllib/_types.py
@@ -0,0 +1,13 @@
+# Copied from https://github.com/python/cpython/blob/v3.12.0/Lib/tomllib/_types.py
+# QGIS does not guarantee a toml reader
+
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2021 Taneli Hukkinen
+# Licensed to PSF under a Contributor Agreement.
+
+from typing import Any, Callable, Tuple
+
+# Type annotations
+ParseFloat = Callable[[str], Any]
+Key = Tuple[str, ...]
+Pos = int
diff --git a/qgis/widgets/dataset_widget.py b/ribasim_qgis/widgets/dataset_widget.py
similarity index 85%
rename from qgis/widgets/dataset_widget.py
rename to ribasim_qgis/widgets/dataset_widget.py
index a32096862..b82e20df6 100644
--- a/qgis/widgets/dataset_widget.py
+++ b/ribasim_qgis/widgets/dataset_widget.py
@@ -4,8 +4,9 @@
 This widget also allows enabling or disabling individual elements for a
 computation.
 """
+from datetime import datetime
 from pathlib import Path
-from typing import Any, List, Set
+from typing import Any
 
 import numpy as np
 from PyQt5.QtCore import Qt
@@ -24,12 +25,13 @@
     QVBoxLayout,
     QWidget,
 )
-from ribasim_qgis.core.nodes import Edge, Node, load_nodes_from_geopackage
-from ribasim_qgis.core.topology import derive_connectivity, explode_lines
-
 from qgis.core import QgsMapLayer, QgsProject
 from qgis.core.additions.edit import edit
 
+import ribasim_qgis.tomllib as tomllib
+from ribasim_qgis.core.nodes import Edge, Node, load_nodes_from_geopackage
+from ribasim_qgis.core.topology import derive_connectivity, explode_lines
+
 
 class DatasetTreeWidget(QTreeWidget):
     def __init__(self, parent=None):
@@ -47,7 +49,7 @@ def __init__(self, parent=None):
         self.setColumnWidth(0, 1)
         self.setColumnWidth(2, 1)
 
-    def items(self) -> List[QTreeWidgetItem]:
+    def items(self) -> list[QTreeWidgetItem]:
         root = self.invisibleRootItem()
         return [root.child(i) for i in range(root.childCount())]
 
@@ -129,12 +131,12 @@ def __init__(self, parent):
         self.dataset_tree.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Expanding)
         self.dataset_line_edit = QLineEdit()
         self.dataset_line_edit.setEnabled(False)  # Just used as a viewing port
-        self.new_geopackage_button = QPushButton("New")
-        self.open_geopackage_button = QPushButton("Open")
+        self.new_model_button = QPushButton("New")
+        self.open_model_button = QPushButton("Open")
         self.remove_button = QPushButton("Remove from Dataset")
         self.add_button = QPushButton("Add to QGIS")
-        self.new_geopackage_button.clicked.connect(self.new_geopackage)
-        self.open_geopackage_button.clicked.connect(self.open_geopackage)
+        self.new_model_button.clicked.connect(self.new_model)
+        self.open_model_button.clicked.connect(self.open_model)
         self.suppress_popup_checkbox = QCheckBox("Suppress attribute form pop-up")
         self.suppress_popup_checkbox.stateChanged.connect(self.suppress_popup_changed)
         self.remove_button.clicked.connect(self.remove_geopackage_layer)
@@ -146,8 +148,8 @@ def __init__(self, parent):
         dataset_row = QHBoxLayout()
         layer_row = QHBoxLayout()
         dataset_row.addWidget(self.dataset_line_edit)
-        dataset_row.addWidget(self.open_geopackage_button)
-        dataset_row.addWidget(self.new_geopackage_button)
+        dataset_row.addWidget(self.open_model_button)
+        dataset_row.addWidget(self.new_model_button)
         dataset_layout.addLayout(dataset_row)
         dataset_layout.addWidget(self.dataset_tree)
         dataset_layout.addWidget(self.suppress_popup_checkbox)
@@ -158,7 +160,7 @@ def __init__(self, parent):
 
     @property
     def path(self) -> str:
-        """Returns currently active path to GeoPackage"""
+        """Returns currently active path to Ribasim model (.toml)"""
         return self.dataset_line_edit.text()
 
     def explode_and_connect(self) -> None:
@@ -241,7 +243,8 @@ def add_selection_to_qgis(self) -> None:
     def load_geopackage(self) -> None:
         """Load the layers of a GeoPackage into the Layers Panel"""
         self.dataset_tree.clear()
-        nodes = load_nodes_from_geopackage(self.path)
+        geo_path = self._get_database_path_from_model_file()
+        nodes = load_nodes_from_geopackage(geo_path)
         for node_layer in nodes.values():
             self.dataset_tree.add_node_layer(node_layer)
         name = str(Path(self.path).stem)
@@ -255,21 +258,38 @@ def load_geopackage(self) -> None:
         self.edge_layer.editingStopped.connect(self.explode_and_connect)
         return
 
-    def new_geopackage(self) -> None:
-        """Create a new GeoPackage file, and set it as the active dataset."""
-        path, _ = QFileDialog.getSaveFileName(self, "Select file", "", "*.gpkg")
+    def _get_database_path_from_model_file(self) -> str:
+        with open(self.path, "rb") as f:
+            model_filename = tomllib.load(f)["database"]
+            return str(Path(self.path).parent.joinpath(model_filename))
+
+    def new_model(self) -> None:
+        """Create a new Ribasim model file, and set it as the active dataset."""
+        path, _ = QFileDialog.getSaveFileName(self, "Select file", "", "*.toml")
         if path != "":  # Empty string in case of cancel button press
             self.dataset_line_edit.setText(path)
+            geo_path = Path(self.path).parent.joinpath("database.gpkg")
+            self._write_new_model(geo_path.name)
             for input_type in (Node, Edge):
-                instance = input_type.create(path, self.parent.crs, names=[])
+                instance = input_type.create(str(geo_path), self.parent.crs, names=[])
                 instance.write()
             self.load_geopackage()
             self.parent.toggle_node_buttons(True)
 
-    def open_geopackage(self) -> None:
-        """Open a GeoPackage file, containing Ribasim input."""
+    def _write_new_model(self, database_name: str) -> None:
+        with open(self.path, "w") as f:
+            f.writelines(
+                [
+                    f'database = "{database_name}"\n',
+                    f"starttime = {datetime(2020, 1, 1)}\n",
+                    f"endtime = {datetime(2030, 1, 1)}\n",
+                ]
+            )
+
+    def open_model(self) -> None:
+        """Open a Ribasim model file."""
         self.dataset_tree.clear()
-        path, _ = QFileDialog.getOpenFileName(self, "Select file", "", "*.gpkg")
+        path, _ = QFileDialog.getOpenFileName(self, "Select file", "", "*.toml")
         if path != "":  # Empty string in case of cancel button press
             self.dataset_line_edit.setText(path)
             self.load_geopackage()
@@ -300,7 +320,7 @@ def active_nodes(self):
             active_nodes[item.text(1)] = not (item.checkbox.isChecked() == 0)
         return active_nodes
 
-    def selection_names(self) -> Set[str]:
+    def selection_names(self) -> set[str]:
         selection = self.dataset_tree.items()
         # Append associated items
         return {item.element.name for item in selection}
diff --git a/qgis/widgets/nodes_widget.py b/ribasim_qgis/widgets/nodes_widget.py
similarity index 99%
rename from qgis/widgets/nodes_widget.py
rename to ribasim_qgis/widgets/nodes_widget.py
index 0d09d277c..bcce08be7 100644
--- a/qgis/widgets/nodes_widget.py
+++ b/ribasim_qgis/widgets/nodes_widget.py
@@ -1,6 +1,7 @@
 from functools import partial
 
 from PyQt5.QtWidgets import QGridLayout, QPushButton, QVBoxLayout, QWidget
+
 from ribasim_qgis.core.nodes import NODES
 
 
diff --git a/qgis/widgets/results_widget.py b/ribasim_qgis/widgets/results_widget.py
similarity index 100%
rename from qgis/widgets/results_widget.py
rename to ribasim_qgis/widgets/results_widget.py
diff --git a/qgis/widgets/ribasim_widget.py b/ribasim_qgis/widgets/ribasim_widget.py
similarity index 98%
rename from qgis/widgets/ribasim_widget.py
rename to ribasim_qgis/widgets/ribasim_widget.py
index 6d3303952..aea0e364c 100644
--- a/qgis/widgets/ribasim_widget.py
+++ b/ribasim_qgis/widgets/ribasim_widget.py
@@ -9,12 +9,12 @@
 from typing import Any
 
 from PyQt5.QtWidgets import QTabWidget, QVBoxLayout, QWidget
+from qgis.core import QgsEditFormConfig, QgsMapLayer, QgsProject
+
 from ribasim_qgis.widgets.dataset_widget import DatasetWidget
 from ribasim_qgis.widgets.nodes_widget import NodesWidget
 from ribasim_qgis.widgets.results_widget import ResultsWidget
 
-from qgis.core import QgsEditFormConfig, QgsMapLayer, QgsProject
-
 PYQT_DELETED_ERROR = "wrapped C/C++ object of type QgsLayerTreeGroup has been deleted"
 
 
@@ -33,7 +33,7 @@ def __init__(self, parent, iface):
         self.layout = QVBoxLayout()
         self.tabwidget = QTabWidget()
         self.layout.addWidget(self.tabwidget)
-        self.tabwidget.addTab(self.dataset_widget, "Database")
+        self.tabwidget.addTab(self.dataset_widget, "Model")
         self.tabwidget.addTab(self.nodes_widget, "Nodes")
         self.tabwidget.addTab(self.results_widget, "Results")
         self.setLayout(self.layout)
diff --git a/ruff.toml b/ruff.toml
index 0f7924e99..c00b7d04e 100644
--- a/ruff.toml
+++ b/ruff.toml
@@ -1,5 +1,5 @@
 # See https://docs.astral.sh/ruff/rules/
-select = ["C4", "D2", "D3", "D4", "E", "F", "I", "NPY", "PD"]
+select = ["C4", "D2", "D3", "D4", "E", "F", "I", "NPY", "PD", "UP"]
 ignore = [
     "D202",
     "D205",
@@ -14,6 +14,8 @@ ignore = [
 ]
 fixable = ["I"]
 extend-include = ["*.ipynb"]
+exclude = ["ribasim_qgis/tomllib/*"]
+target-version = "py39"
 
 [pydocstyle]
 convention = "numpy"
diff --git a/utils/generate-testmodels.py b/utils/generate-testmodels.py
index 02ebac8a6..9233b94df 100644
--- a/utils/generate-testmodels.py
+++ b/utils/generate-testmodels.py
@@ -19,5 +19,6 @@
     )
 
     for model_name, model_constructor in ribasim_testmodels.constructors.items():
+        print(f"Generating {model_name}")
         model = model_constructor()
         model.write(datadir / model_name)