diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml
index 3bf47f1..7a8e4a1 100644
--- a/.github/workflows/build-test-package.yml
+++ b/.github/workflows/build-test-package.yml
@@ -12,10 +12,10 @@ on:
 
 jobs:
   cxx-build-workflow:
-    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.6
+    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.4
 
   python-build-workflow:
-    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.6
+    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.4
     with:
       itk-wheel-tag: 'v5.4.5'
       itk-python-package-tag: 'v5.4.5'
diff --git a/include/itkCannyEdgesDistanceAdvectionFieldFeatureGenerator.h b/include/itkCannyEdgesDistanceAdvectionFieldFeatureGenerator.h
index ea6d079..e0cdc1a 100644
--- a/include/itkCannyEdgesDistanceAdvectionFieldFeatureGenerator.h
+++ b/include/itkCannyEdgesDistanceAdvectionFieldFeatureGenerator.h
@@ -99,8 +99,6 @@ class ITK_TEMPLATE_EXPORT CannyEdgesDistanceAdvectionFieldFeatureGenerator : pub
   using ProcessObject::SetInput;
   void
   SetInput(const SpatialObjectType * input);
-  const SpatialObjectType *
-  GetInput() const;
 
   /** Output data that carries the feature in the form of a
    * SpatialObject. */
diff --git a/include/itkCannyEdgesDistanceFeatureGenerator.h b/include/itkCannyEdgesDistanceFeatureGenerator.h
index 2c06a54..1ad4f8b 100644
--- a/include/itkCannyEdgesDistanceFeatureGenerator.h
+++ b/include/itkCannyEdgesDistanceFeatureGenerator.h
@@ -95,8 +95,6 @@ class ITK_TEMPLATE_EXPORT CannyEdgesDistanceFeatureGenerator : public FeatureGen
   using ProcessObject::SetInput;
   void
   SetInput(const SpatialObjectType * input);
-  const SpatialObjectType *
-  GetInput() const;
 
   /** Output data that carries the feature in the form of a
    * SpatialObject. */
diff --git a/include/itkCannyEdgesFeatureGenerator.h b/include/itkCannyEdgesFeatureGenerator.h
index 972472b..fa228f0 100644
--- a/include/itkCannyEdgesFeatureGenerator.h
+++ b/include/itkCannyEdgesFeatureGenerator.h
@@ -93,8 +93,6 @@ class ITK_TEMPLATE_EXPORT CannyEdgesFeatureGenerator : public FeatureGenerator<N
   using ProcessObject::SetInput;
   void
   SetInput(const SpatialObjectType * input);
-  const SpatialObjectType *
-  GetInput() const;
 
   /** Output data that carries the feature in the form of a
    * SpatialObject. */
diff --git a/include/itkDescoteauxSheetnessFeatureGenerator.h b/include/itkDescoteauxSheetnessFeatureGenerator.h
index c18ef44..df9996d 100644
--- a/include/itkDescoteauxSheetnessFeatureGenerator.h
+++ b/include/itkDescoteauxSheetnessFeatureGenerator.h
@@ -74,8 +74,6 @@ class ITK_TEMPLATE_EXPORT DescoteauxSheetnessFeatureGenerator : public FeatureGe
   using ProcessObject::SetInput;
   void
   SetInput(const SpatialObjectType * input);
-  const SpatialObjectType *
-  GetInput() const;
 
   /** Output data that carries the feature in the form of a
    * SpatialObject. */
diff --git a/include/itkFeatureGenerator.hxx b/include/itkFeatureGenerator.hxx
index 853b7c5..d78dc1a 100644
--- a/include/itkFeatureGenerator.hxx
+++ b/include/itkFeatureGenerator.hxx
@@ -46,6 +46,13 @@ FeatureGenerator<NDimension>::SetInput(const SpatialObjectType * spatialObject)
   this->SetNthInput(0, const_cast<SpatialObjectType *>(spatialObject));
 }
 
+template <unsigned int NDimension>
+const typename FeatureGenerator<NDimension>::SpatialObjectType *
+FeatureGenerator<NDimension>::GetInput() const
+{
+  return dynamic_cast<const SpatialObjectType *>(this->ProcessObject::GetInput(0));
+}
+
 template <unsigned int NDimension>
 const typename FeatureGenerator<NDimension>::SpatialObjectType *
 FeatureGenerator<NDimension>::GetFeature() const
diff --git a/include/itkFrangiTubularnessFeatureGenerator.h b/include/itkFrangiTubularnessFeatureGenerator.h
index 37a394e..749e324 100644
--- a/include/itkFrangiTubularnessFeatureGenerator.h
+++ b/include/itkFrangiTubularnessFeatureGenerator.h
@@ -72,8 +72,6 @@ class ITK_TEMPLATE_EXPORT FrangiTubularnessFeatureGenerator : public FeatureGene
   using ProcessObject::SetInput;
   void
   SetInput(const SpatialObjectType * input);
-  const SpatialObjectType *
-  GetInput() const;
 
   /** Output data that carries the feature in the form of a
    * SpatialObject. */
diff --git a/include/itkGradientMagnitudeSigmoidFeatureGenerator.h b/include/itkGradientMagnitudeSigmoidFeatureGenerator.h
index a26100b..c961524 100644
--- a/include/itkGradientMagnitudeSigmoidFeatureGenerator.h
+++ b/include/itkGradientMagnitudeSigmoidFeatureGenerator.h
@@ -72,8 +72,6 @@ class ITK_TEMPLATE_EXPORT GradientMagnitudeSigmoidFeatureGenerator : public Feat
   using ProcessObject::SetInput;
   void
   SetInput(const SpatialObjectType * input);
-  const SpatialObjectType *
-  GetInput() const;
 
   /** Output data that carries the feature in the form of a
    * SpatialObject. */
diff --git a/include/itkIsotropicResampler.hxx b/include/itkIsotropicResampler.hxx
index 565f7f7..18bfd66 100644
--- a/include/itkIsotropicResampler.hxx
+++ b/include/itkIsotropicResampler.hxx
@@ -50,6 +50,13 @@ IsotropicResampler<NDimension>::SetInput(const SpatialObjectType * spatialObject
   this->SetNthInput(0, const_cast<SpatialObjectType *>(spatialObject));
 }
 
+template <unsigned int NDimension>
+const typename IsotropicResampler<NDimension>::SpatialObjectType *
+IsotropicResampler<NDimension>::GetInput() const
+{
+  return dynamic_cast<const SpatialObjectType *>(this->ProcessObject::GetInput(0));
+}
+
 template <unsigned int NDimension>
 const typename IsotropicResampler<NDimension>::SpatialObjectType *
 IsotropicResampler<NDimension>::GetOutput() const
diff --git a/include/itkLungWallFeatureGenerator.h b/include/itkLungWallFeatureGenerator.h
index ea17c32..fd2ce43 100644
--- a/include/itkLungWallFeatureGenerator.h
+++ b/include/itkLungWallFeatureGenerator.h
@@ -73,8 +73,6 @@ class ITK_TEMPLATE_EXPORT LungWallFeatureGenerator : public FeatureGenerator<NDi
   using ProcessObject::SetInput;
   void
   SetInput(const SpatialObjectType * input);
-  const SpatialObjectType *
-  GetInput() const;
 
   /** Output data that carries the feature in the form of a
    * SpatialObject. */
diff --git a/include/itkMorphologicalOpeningFeatureGenerator.h b/include/itkMorphologicalOpeningFeatureGenerator.h
index 45e4ee4..57cebf9 100644
--- a/include/itkMorphologicalOpeningFeatureGenerator.h
+++ b/include/itkMorphologicalOpeningFeatureGenerator.h
@@ -76,8 +76,6 @@ class ITK_TEMPLATE_EXPORT MorphologicalOpeningFeatureGenerator : public FeatureG
   using ProcessObject::SetInput;
   void
   SetInput(const SpatialObjectType * input);
-  const SpatialObjectType *
-  GetInput() const;
 
   /** Output data that carries the feature in the form of a
    * SpatialObject. */
diff --git a/include/itkMorphologicalOpenningFeatureGenerator.h b/include/itkMorphologicalOpenningFeatureGenerator.h
index b2efcd9..2091d26 100644
--- a/include/itkMorphologicalOpenningFeatureGenerator.h
+++ b/include/itkMorphologicalOpenningFeatureGenerator.h
@@ -74,8 +74,6 @@ class ITK_EXPORT MorphologicalOpenningFeatureGenerator : public FeatureGenerator
   using ProcessObject::SetInput;
   void
   SetInput(const SpatialObjectType * input);
-  const SpatialObjectType *
-  GetInput() const;
 
   /** Output data that carries the feature in the form of a
    * SpatialObject. */
diff --git a/include/itkSatoLocalStructureFeatureGenerator.h b/include/itkSatoLocalStructureFeatureGenerator.h
index c43a1d0..ab4512a 100644
--- a/include/itkSatoLocalStructureFeatureGenerator.h
+++ b/include/itkSatoLocalStructureFeatureGenerator.h
@@ -72,8 +72,6 @@ class ITK_TEMPLATE_EXPORT SatoLocalStructureFeatureGenerator : public FeatureGen
   using ProcessObject::SetInput;
   void
   SetInput(const SpatialObjectType * input);
-  const SpatialObjectType *
-  GetInput() const;
 
   /** Output data that carries the feature in the form of a
    * SpatialObject. */
diff --git a/include/itkSatoVesselnessFeatureGenerator.h b/include/itkSatoVesselnessFeatureGenerator.h
index b028128..daccc66 100644
--- a/include/itkSatoVesselnessFeatureGenerator.h
+++ b/include/itkSatoVesselnessFeatureGenerator.h
@@ -74,8 +74,6 @@ class ITK_TEMPLATE_EXPORT SatoVesselnessFeatureGenerator : public FeatureGenerat
   using ProcessObject::SetInput;
   void
   SetInput(const SpatialObjectType * input);
-  const SpatialObjectType *
-  GetInput() const;
 
   /** Output data that carries the feature in the form of a
    * SpatialObject. */
diff --git a/include/itkSigmoidFeatureGenerator.h b/include/itkSigmoidFeatureGenerator.h
index b4aa4d7..8e0c9ca 100644
--- a/include/itkSigmoidFeatureGenerator.h
+++ b/include/itkSigmoidFeatureGenerator.h
@@ -73,8 +73,6 @@ class ITK_TEMPLATE_EXPORT SigmoidFeatureGenerator : public FeatureGenerator<NDim
   using ProcessObject::SetInput;
   void
   SetInput(const SpatialObjectType * input);
-  const SpatialObjectType *
-  GetInput() const;
 
   /** Output data that carries the feature in the form of a
    * SpatialObject. */
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3531583..3de6d09 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,30 +1,31 @@
 include_directories("${LesionSizingToolkit_SOURCE_DIR}/src")  # to include itkIncludeRequiredIOFactories.h
+include_directories("${LesionSizingToolkit_SOURCE_DIR}/include")
 add_executable(itkCannyEdgeDetectionImageFilter1  itkCannyEdgeDetectionImageFilter1.cxx )
-target_link_libraries(itkCannyEdgeDetectionImageFilter1 ITK::LesionSizingToolkitModule)
+target_link_libraries(itkCannyEdgeDetectionImageFilter1 ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})
 
 add_executable(itkCannyEdgeDetectionImageFilter2  itkCannyEdgeDetectionImageFilter2.cxx )
-target_link_libraries(itkCannyEdgeDetectionImageFilter2 ITK::LesionSizingToolkitModule)
+target_link_libraries(itkCannyEdgeDetectionImageFilter2 ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})
 
 add_executable(itkDicomSeriesReadImageWrite itkDicomSeriesReadImageWrite.cxx)
-target_link_libraries(itkDicomSeriesReadImageWrite ITK::LesionSizingToolkitModule)
+target_link_libraries(itkDicomSeriesReadImageWrite ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})
 
 add_executable(itkGradientMagnitudeImageFilter itkGradientMagnitudeImageFilter.cxx)
-target_link_libraries(itkGradientMagnitudeImageFilter ITK::LesionSizingToolkitModule)
+target_link_libraries(itkGradientMagnitudeImageFilter ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})
 
 add_executable(itkGradientMagnitudeRecursiveGaussianImageFilter itkGradientMagnitudeRecursiveGaussianImageFilter.cxx)
-target_link_libraries(itkGradientMagnitudeRecursiveGaussianImageFilter ITK::LesionSizingToolkitModule)
+target_link_libraries(itkGradientMagnitudeRecursiveGaussianImageFilter ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})
 
 add_executable(itkImageReadRegionOfInterestAroundSeedWrite itkImageReadRegionOfInterestAroundSeedWrite.cxx)
-target_link_libraries(itkImageReadRegionOfInterestAroundSeedWrite ITK::LesionSizingToolkitModule)
+target_link_libraries(itkImageReadRegionOfInterestAroundSeedWrite ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})
 
 add_executable(itkImageReadRegionOfInterestWrite itkImageReadRegionOfInterestWrite.cxx)
-target_link_libraries(itkImageReadRegionOfInterestWrite ITK::LesionSizingToolkitModule)
+target_link_libraries(itkImageReadRegionOfInterestWrite ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})
 
 add_executable(itkImageReadWrite itkImageReadWrite.cxx)
-target_link_libraries(itkImageReadWrite ITK::LesionSizingToolkitModule)
+target_link_libraries(itkImageReadWrite ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})
 
 add_executable(itkLaplacianRecursiveGaussianImageFilter itkLaplacianRecursiveGaussianImageFilter.cxx)
-target_link_libraries(itkLaplacianRecursiveGaussianImageFilter ITK::LesionSizingToolkitModule)
+target_link_libraries(itkLaplacianRecursiveGaussianImageFilter ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})
 
 add_executable(itkResampleVolumeToBeIsotropic itkResampleVolumeToBeIsotropic.cxx)
-target_link_libraries(itkResampleVolumeToBeIsotropic ITK::LesionSizingToolkitModule)
+target_link_libraries(itkResampleVolumeToBeIsotropic ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})
diff --git a/wrapping/CMakeLists.txt b/wrapping/CMakeLists.txt
index dbdc8c4..d564480 100644
--- a/wrapping/CMakeLists.txt
+++ b/wrapping/CMakeLists.txt
@@ -1,6 +1,14 @@
 itk_wrap_module(LesionSizingToolkit)
 
 set(WRAPPER_SUBMODULE_ORDER
+   itkFeatureGenerator
+   itkFeatureAggregator
+   itkSatoVesselnessFeatureGenerator
+   itkSegmentationModule
+   itkRegionGrowingSegmentationModule
+   itkSinglePhaseLevelSetSegmentationModule
+   itkFastMarchingSegmentationModule
+   itkSegmentationVolumeEstimator
    itkBinaryThresholdFeatureGenerator
    itkCannyEdgeDetectionRecursiveGaussianImageFilter
    itkCannyEdgesDistanceAdvectionFieldFeatureGenerator
@@ -12,9 +20,6 @@ set(WRAPPER_SUBMODULE_ORDER
    itkDescoteauxSheetnessImageFilter
    itkFastMarchingAndGeodesicActiveContourLevelSetSegmentationModule
    itkFastMarchingAndShapeDetectionLevelSetSegmentationModule
-   itkFastMarchingSegmentationModule
-   itkFeatureAggregator
-   itkFeatureGenerator
    itkFrangiTubularnessFeatureGenerator
    itkFrangiTubularnessImageFilter
    itkGeodesicActiveContourLevelSetSegmentationModule
@@ -31,15 +36,10 @@ set(WRAPPER_SUBMODULE_ORDER
    itkMinimumFeatureAggregator
    itkMorphologicalOpeningFeatureGenerator
    itkRegionCompetitionImageFilter
-   itkRegionGrowingSegmentationModule
    itkSatoLocalStructureFeatureGenerator
-   itkSatoVesselnessFeatureGenerator
    itkSatoVesselnessSigmoidFeatureGenerator
-   itkSegmentationModule
-   itkSegmentationVolumeEstimator
    itkShapeDetectionLevelSetSegmentationModule
    itkSigmoidFeatureGenerator
-   itkSinglePhaseLevelSetSegmentationModule
    itkVesselEnhancingDiffusion3DImageFilter
    itkVotingBinaryHoleFillFloodingImageFilter
    itkWeightedSumFeatureAggregator
diff --git a/wrapping/itkDescoteauxSheetnessImageFilter.wrap b/wrapping/itkDescoteauxSheetnessImageFilter.wrap
index ced7428..387a0bf 100644
--- a/wrapping/itkDescoteauxSheetnessImageFilter.wrap
+++ b/wrapping/itkDescoteauxSheetnessImageFilter.wrap
@@ -1,3 +1,3 @@
-itk_wrap_class("itk::DescoteauxSheetnessImageFilter" POINTER)
-  itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2+)
+itk_wrap_class("itk::DescoteauxSheetnessImageFilter" POINTER_WITH_SUPERCLASS)
+  itk_wrap_image_filter_combinations("${WRAP_ITK_COV_VECTOR_REAL}" "${WRAP_ITK_REAL}")
 itk_end_wrap_class()
diff --git a/wrapping/itkFrangiTubularnessImageFilter.wrap b/wrapping/itkFrangiTubularnessImageFilter.wrap
index 392b4d6..f6ca14c 100644
--- a/wrapping/itkFrangiTubularnessImageFilter.wrap
+++ b/wrapping/itkFrangiTubularnessImageFilter.wrap
@@ -1,3 +1,3 @@
-itk_wrap_class("itk::FrangiTubularnessImageFilter" POINTER)
-  itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2+)
+itk_wrap_class("itk::FrangiTubularnessImageFilter" POINTER_WITH_SUPERCLASS)
+  itk_wrap_image_filter_combinations("${WRAP_ITK_COV_VECTOR_REAL}" "${WRAP_ITK_REAL}")
 itk_end_wrap_class()
diff --git a/wrapping/itkLesionSegmentationImageFilter8.wrap b/wrapping/itkLesionSegmentationImageFilter8.wrap
index b473592..b0f8f8c 100644
--- a/wrapping/itkLesionSegmentationImageFilter8.wrap
+++ b/wrapping/itkLesionSegmentationImageFilter8.wrap
@@ -1,3 +1,3 @@
 itk_wrap_class("itk::LesionSegmentationImageFilter8" POINTER)
-  itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2+)
+  itk_wrap_image_filter_combinations("${WRAP_ITK_SCALAR}" "${WRAP_ITK_REAL}" 3)
 itk_end_wrap_class()
diff --git a/wrapping/itkLocalStructureImageFilter.wrap b/wrapping/itkLocalStructureImageFilter.wrap
index cd29f9c..34c8952 100644
--- a/wrapping/itkLocalStructureImageFilter.wrap
+++ b/wrapping/itkLocalStructureImageFilter.wrap
@@ -1,3 +1,3 @@
 itk_wrap_class("itk::LocalStructureImageFilter" POINTER_WITH_SUPERCLASS)
-  itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2)
+  itk_wrap_image_filter_combinations("${WRAP_ITK_COV_VECTOR_REAL}" "${WRAP_ITK_REAL}")
 itk_end_wrap_class()
diff --git a/wrapping/itkRegionCompetitionImageFilter.wrap b/wrapping/itkRegionCompetitionImageFilter.wrap
index 551aba7..3a36f44 100644
--- a/wrapping/itkRegionCompetitionImageFilter.wrap
+++ b/wrapping/itkRegionCompetitionImageFilter.wrap
@@ -1,3 +1,3 @@
 itk_wrap_class("itk::RegionCompetitionImageFilter" POINTER)
-  itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2+)
+  itk_wrap_image_filter("${WRAP_ITK_INT}" 2 2+)
 itk_end_wrap_class()
diff --git a/wrapping/itkSatoVesselnessFeatureGenerator.wrap b/wrapping/itkSatoVesselnessFeatureGenerator.wrap
index fcf1945..64fefe3 100644
--- a/wrapping/itkSatoVesselnessFeatureGenerator.wrap
+++ b/wrapping/itkSatoVesselnessFeatureGenerator.wrap
@@ -1,5 +1,6 @@
-itk_wrap_class("itk::SatoVesselnessSigmoidFeatureGenerator" POINTER)
-  foreach(d ${ITK_WRAP_IMAGE_DIMS})
-    itk_wrap_template(${d} ${d})
-  endforeach()
-itk_end_wrap_class()
+itk_wrap_filter_dims(has_d_3 3)
+if(has_d_3)
+  itk_wrap_class("itk::SatoVesselnessFeatureGenerator" POINTER)
+    itk_wrap_template(3 3)
+  itk_end_wrap_class()
+endif()
diff --git a/wrapping/itkSatoVesselnessSigmoidFeatureGenerator.wrap b/wrapping/itkSatoVesselnessSigmoidFeatureGenerator.wrap
index fcf1945..1867004 100644
--- a/wrapping/itkSatoVesselnessSigmoidFeatureGenerator.wrap
+++ b/wrapping/itkSatoVesselnessSigmoidFeatureGenerator.wrap
@@ -1,5 +1,6 @@
-itk_wrap_class("itk::SatoVesselnessSigmoidFeatureGenerator" POINTER)
-  foreach(d ${ITK_WRAP_IMAGE_DIMS})
-    itk_wrap_template(${d} ${d})
-  endforeach()
-itk_end_wrap_class()
+itk_wrap_filter_dims(has_d_3 3)
+if(has_d_3)
+  itk_wrap_class("itk::SatoVesselnessSigmoidFeatureGenerator" POINTER)
+    itk_wrap_template(3 3)
+  itk_end_wrap_class()
+endif()
diff --git a/wrapping/itkVesselEnhancingDiffusion3DImageFilter.wrap b/wrapping/itkVesselEnhancingDiffusion3DImageFilter.wrap
index 6a949f5..9b38bfd 100644
--- a/wrapping/itkVesselEnhancingDiffusion3DImageFilter.wrap
+++ b/wrapping/itkVesselEnhancingDiffusion3DImageFilter.wrap
@@ -1,3 +1,8 @@
-itk_wrap_class("itk::VesselEnhancingDiffusion3DImageFilter" POINTER)
-  itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2+)
-itk_end_wrap_class()
+itk_wrap_filter_dims(has_d_3 3)
+if(has_d_3)
+  itk_wrap_class("itk::VesselEnhancingDiffusion3DImageFilter" POINTER)
+  foreach(t ${WRAP_ITK_SCALAR})
+    itk_wrap_template("${ITKM_${t}}3" "${ITKT_${t}}, 3")
+  endforeach()
+  itk_end_wrap_class()
+endif()