diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml
index 19b97f5..4696eca 100644
--- a/.github/workflows/build-test-package.yml
+++ b/.github/workflows/build-test-package.yml
@@ -5,11 +5,13 @@ on: [push,pull_request]
 
 jobs:
   cxx-build-workflow:
-    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.0
+    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.6
 
   python-build-workflow:
-    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.0
+    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.6
     with:
+      itk-wheel-tag: 'v5.4.5'
+      itk-python-package-tag: 'v5.4.5'
       test-notebooks: false
     secrets:
       pypi_password: ${{ secrets.pypi_password }}
diff --git a/include/itkBioCellularAggregate.hxx b/include/itkBioCellularAggregate.hxx
index 987e30b..e82bc45 100644
--- a/include/itkBioCellularAggregate.hxx
+++ b/include/itkBioCellularAggregate.hxx
@@ -606,10 +606,10 @@ CellularAggregate<NSpaceDimension>::GetSubstrateValue(IdentifierType cellId, uns
 
   typename SubstrateType::IndexType index;
 
-  substrate->TransformPhysicalPointToIndex(cellPosition, index);
+  const bool isInside = substrate->TransformPhysicalPointToIndex(cellPosition, index);
 
   SubstrateValueType value = 0;
-  if (substrate->GetBufferedRegion().IsInside(index))
+  if (isInside && substrate->GetBufferedRegion().IsInside(index))
   {
     value = substrate->GetPixel(index);
   }
diff --git a/pyproject.toml b/pyproject.toml
index 7854661..488adec 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -34,7 +34,7 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Medical Science Apps.",
     "Topic :: Software Development :: Libraries",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 dependencies = [
     "itk == 5.4.*",
 ]
@@ -47,7 +47,7 @@ Homepage = "https://github.com/InsightSoftwareConsortium/ITKBioCell"
 # The versions of CMake to allow. If CMake is not present on the system or does
 # not pass this specifier, it will be downloaded via PyPI if possible. An empty
 # string will disable this check.
-cmake.version = ">=3.16.3"
+cmake.version = ">=3.22.1"
 
 # A list of args to pass to CMake when configuring the project. Setting this in
 # config or envvar will override toml. See also ``cmake.define``.
diff --git a/wrapping/CMakeLists.txt b/wrapping/CMakeLists.txt
new file mode 100644
index 0000000..7d69d43
--- /dev/null
+++ b/wrapping/CMakeLists.txt
@@ -0,0 +1,7 @@
+itk_wrap_module(BioCell)
+set(WRAPPER_SUBMODULE_ORDER
+  itkBioCellularAggregateBase
+  itkBioCellularAggregate
+)
+itk_auto_load_submodules()
+itk_end_wrap_module()
diff --git a/wrapping/itkBioCellularAggregate.wrap b/wrapping/itkBioCellularAggregate.wrap
new file mode 100644
index 0000000..8709453
--- /dev/null
+++ b/wrapping/itkBioCellularAggregate.wrap
@@ -0,0 +1,7 @@
+set(WRAPPER_AUTO_INCLUDE_HEADERS OFF)
+itk_wrap_include("itkBioCellularAggregate.h")
+itk_wrap_class("itk::bio::CellularAggregate" POINTER)
+  itk_wrap_template("2" "2")
+  itk_wrap_template("3" "3")
+itk_end_wrap_class()
+set(WRAPPER_AUTO_INCLUDE_HEADERS ON)
diff --git a/wrapping/itkBioCellularAggregateBase.wrap b/wrapping/itkBioCellularAggregateBase.wrap
new file mode 100644
index 0000000..65c6913
--- /dev/null
+++ b/wrapping/itkBioCellularAggregateBase.wrap
@@ -0,0 +1,4 @@
+set(WRAPPER_AUTO_INCLUDE_HEADERS OFF)
+itk_wrap_include("itkBioCellularAggregateBase.h")
+itk_wrap_simple_class("itk::bio::CellularAggregateBase" POINTER)
+set(WRAPPER_AUTO_INCLUDE_HEADERS ON)