diff --git a/python/ribasim/ribasim/schemas.py b/python/ribasim/ribasim/schemas.py
index 72b1f4191..cb6e30441 100644
--- a/python/ribasim/ribasim/schemas.py
+++ b/python/ribasim/ribasim/schemas.py
@@ -12,7 +12,7 @@ class Config:
 
 
 class BasinBoundaryconcentrationSchema(_BaseSchema):
-    node_id: Series[int] = pa.Field(nullable=False, default=0)
+    node_id: Series[Int32] = pa.Field(nullable=False, default=0)
     time: Series[Timestamp] = pa.Field(nullable=False)
     substance: Series[str] = pa.Field(nullable=False)
     drainage_concentration: Series[float] = pa.Field(nullable=True)
@@ -21,7 +21,7 @@ class BasinBoundaryconcentrationSchema(_BaseSchema):
 
 
 class BasinConcentrationSchema(_BaseSchema):
-    node_id: Series[int] = pa.Field(nullable=False, default=0)
+    node_id: Series[Int32] = pa.Field(nullable=False, default=0)
     time: Series[Timestamp] = pa.Field(nullable=False)
     substance: Series[str] = pa.Field(nullable=False)
     concentration: Series[float] = pa.Field(nullable=False)
@@ -76,13 +76,6 @@ class DiscreteControlLogicSchema(_BaseSchema):
     control_state: Series[str] = pa.Field(nullable=False)
 
 
-class FlowBoundaryConcentrationSchema(_BaseSchema):
-    node_id: Series[int] = pa.Field(nullable=False, default=0)
-    time: Series[Timestamp] = pa.Field(nullable=False)
-    substance: Series[str] = pa.Field(nullable=False)
-    concentration: Series[float] = pa.Field(nullable=False)
-
-
 class DiscreteControlVariableSchema(_BaseSchema):
     node_id: Series[Int32] = pa.Field(nullable=False, default=0)
     compound_variable_id: Series[Int32] = pa.Field(nullable=False, default=0)
@@ -93,6 +86,13 @@ class DiscreteControlVariableSchema(_BaseSchema):
     look_ahead: Series[float] = pa.Field(nullable=True)
 
 
+class FlowBoundaryConcentrationSchema(_BaseSchema):
+    node_id: Series[Int32] = pa.Field(nullable=False, default=0)
+    time: Series[Timestamp] = pa.Field(nullable=False)
+    substance: Series[str] = pa.Field(nullable=False)
+    concentration: Series[float] = pa.Field(nullable=False)
+
+
 class FlowBoundaryStaticSchema(_BaseSchema):
     node_id: Series[Int32] = pa.Field(nullable=False, default=0)
     active: Series[pa.BOOL] = pa.Field(nullable=True)
@@ -125,7 +125,7 @@ class FractionalFlowStaticSchema(_BaseSchema):
 
 
 class LevelBoundaryConcentrationSchema(_BaseSchema):
-    node_id: Series[int] = pa.Field(nullable=False, default=0)
+    node_id: Series[Int32] = pa.Field(nullable=False, default=0)
     time: Series[Timestamp] = pa.Field(nullable=False)
     substance: Series[str] = pa.Field(nullable=False)
     concentration: Series[float] = pa.Field(nullable=False)