diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeKMedoids.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeKMedoids.cpp
index 2291e75516..591b4343f8 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeKMedoids.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeKMedoids.cpp
@@ -18,8 +18,8 @@ class KMedoidsTemplate
   KMedoidsTemplate(ComputeKMedoids* filter, const IDataArray* inputIDataArray, IDataArray* medoidsIDataArray, const std::unique_ptr<MaskCompare>& maskDataArray, usize numClusters,
                    Int32AbstractDataStore& fIds, ClusterUtilities::DistanceMetric distMetric, std::mt19937_64::result_type seed)
   : m_Filter(filter)
-  , m_InputArray(inputIDataArray->getIDataStoreRefAs<AbstractDataStore<T>>())
-  , m_Medoids(medoidsIDataArray->getIDataStoreRefAs<AbstractDataStore<T>>())
+  , m_InputArray(inputIDataArray->template getIDataStoreRefAs<AbstractDataStore<T>>())
+  , m_Medoids(medoidsIDataArray->template getIDataStoreRefAs<AbstractDataStore<T>>())
   , m_Mask(maskDataArray)
   , m_NumClusters(numClusters)
   , m_FeatureIds(fIds)
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractComponentAsArray.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractComponentAsArray.cpp
index 12726dc980..f778c33010 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractComponentAsArray.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractComponentAsArray.cpp
@@ -12,8 +12,8 @@ struct RemoveComponentsFunctor
   template <class ScalarType>
   void operator()(IDataArray* originalArray, IDataArray* resizedArray, usize componentIndexToRemove) // Due to logic structure originalArray cannot be const
   {
-    const auto& originalStoreRef = originalArray->getIDataStoreRefAs<AbstractDataStore<ScalarType>>();
-    auto& resizedStoreRef = resizedArray->getIDataStoreRefAs<AbstractDataStore<ScalarType>>();
+    const auto& originalStoreRef = originalArray->template getIDataStoreRefAs<AbstractDataStore<ScalarType>>();
+    auto& resizedStoreRef = resizedArray->template getIDataStoreRefAs<AbstractDataStore<ScalarType>>();
 
     const usize originalTupleCount = originalStoreRef.getNumberOfTuples();
     const usize originalCompCount = originalStoreRef.getNumberOfComponents();
@@ -42,8 +42,8 @@ struct ExtractComponentsFunctor
   template <class ScalarType>
   void operator()(IDataArray* inputArray, IDataArray* extractedCompArray, usize componentIndexToExtract) // Due to logic structure inputArray cannot be const
   {
-    const auto& inputStoreRef = inputArray->getIDataStoreRefAs<AbstractDataStore<ScalarType>>();
-    auto& extractedStoreRef = extractedCompArray->getIDataStoreRefAs<AbstractDataStore<ScalarType>>();
+    const auto& inputStoreRef = inputArray->template getIDataStoreRefAs<AbstractDataStore<ScalarType>>();
+    auto& extractedStoreRef = extractedCompArray->template getIDataStoreRefAs<AbstractDataStore<ScalarType>>();
 
     const usize inputTupleCount = inputStoreRef.getNumberOfTuples();
     const usize inputCompCount = inputStoreRef.getNumberOfComponents();
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractVertexGeometry.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractVertexGeometry.cpp
index 4e6de1ad0a..a7473daece 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractVertexGeometry.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractVertexGeometry.cpp
@@ -25,7 +25,7 @@ struct CopyDataFunctor
   template <typename T>
   void operator()(const IDataArray* srcIArray, IDataArray* destIArray, const std::vector<bool>& maskArray)
   {
-    const auto& srcArray = srcIArray->getIDataStoreRefAs<AbstractDataStore<T>>();
+    const auto& srcArray = srcIArray->template getIDataStoreRefAs<AbstractDataStore<T>>();
     auto& destArray = destIArray->getIDataStoreRefAs<AbstractDataStore<T>>();
 
     bool useMask = !maskArray.empty();
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FillBadData.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FillBadData.cpp
index 7439536db8..30e15e25a1 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FillBadData.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FillBadData.cpp
@@ -41,7 +41,7 @@ struct FillBadDataUpdateTuplesFunctor
   template <typename T>
   void operator()(const Int32AbstractDataStore& featureIds, IDataArray* outputIDataArray, const std::vector<int32>& neighbors)
   {
-    auto& outputStore = outputIDataArray->getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& outputStore = outputIDataArray->template getIDataStoreRefAs<AbstractDataStore<T>>();
     FillBadDataUpdateTuples(featureIds, outputStore, neighbors);
   }
 };
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FlyingEdges3D.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FlyingEdges3D.cpp
index 44559792d5..309244b167 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FlyingEdges3D.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FlyingEdges3D.cpp
@@ -12,7 +12,7 @@ struct ExecuteFlyingEdgesFunctor
   template <typename T>
   void operator()(const ImageGeom& image, const IDataArray* iDataArray, float64 isoVal, TriangleGeom& triangleGeom, Float32AbstractDataStore& normals, AttributeMatrix& normAM)
   {
-    FlyingEdgesAlgorithm flyingEdges = FlyingEdgesAlgorithm<T>(image, iDataArray->getIDataStoreRefAs<AbstractDataStore<T>>(), static_cast<T>(isoVal), triangleGeom, normals);
+    FlyingEdgesAlgorithm flyingEdges = FlyingEdgesAlgorithm<T>(image, iDataArray->template getIDataStoreRefAs<AbstractDataStore<T>>(), static_cast<T>(isoVal), triangleGeom, normals);
     flyingEdges.pass1();
     flyingEdges.pass2();
     flyingEdges.pass3();
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.cpp
index e5ca576237..1e8638807c 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.cpp
@@ -76,7 +76,7 @@ class TSpecificCompareFunctor : public SegmentFeatures::CompareFunctor
   : m_Length(length)
   , m_Tolerance(tolerance)
   , m_FeatureIdsArray(featureIds)
-  , m_Data(data->getIDataStoreRefAs<DataStoreType>())
+  , m_Data(data->template getIDataStoreRefAs<DataStoreType>())
   {
   }
   TSpecificCompareFunctor() = default;
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/Silhouette.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/Silhouette.cpp
index 34393f9f3e..cf652236a4 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/Silhouette.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/Silhouette.cpp
@@ -28,7 +28,7 @@ class SilhouetteTemplate
 
   SilhouetteTemplate(const IDataArray& inputIDataArray, Float64AbstractDataStore& outputDataArray, const std::unique_ptr<MaskCompare>& maskDataArray, usize numClusters,
                      const Int32AbstractDataStore& featureIds, ClusterUtilities::DistanceMetric distMetric)
-  : m_InputData(inputIDataArray.getIDataStoreRefAs<AbstractDataStoreT>())
+  : m_InputData(inputIDataArray.template getIDataStoreRefAs<AbstractDataStoreT>())
   , m_OutputData(outputDataArray)
   , m_Mask(maskDataArray)
   , m_NumClusters(numClusters)
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SplitAttributeArray.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SplitAttributeArray.cpp
index 5c9223f093..8aab40214b 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SplitAttributeArray.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SplitAttributeArray.cpp
@@ -13,7 +13,7 @@ struct SplitArraysFunctor
   template <typename T>
   void operator()(DataStructure& dataStructure, const IDataArray* inputIDataArray, const SplitAttributeArrayInputValues* inputValues)
   {
-    const auto& inputStore = inputIDataArray->getIDataStoreRefAs<AbstractDataStore<T>>();
+    const auto& inputStore = inputIDataArray->template getIDataStoreRefAs<AbstractDataStore<T>>();
     usize numTuples = inputStore.getNumberOfTuples();
     usize numComponents = inputStore.getNumberOfComponents();
     for(const auto& j : inputValues->ExtractComponents)
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp
index b56d8b54eb..9d6f4a1c51 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp
@@ -84,7 +84,7 @@ Result<> WriteAvizoRectilinearCoordinate::writeData(FILE* outputFile) const
 
   fprintf(outputFile, "@1 # FeatureIds in z, y, x with X moving fastest, then Y, then Z\n");
 
-  const auto& featureIds = m_DataStructure.getDataAs<Int32Array>(m_InputValues->FeatureIdsArrayPath)->getIDataStoreRefAs<DataStore<int32>>();
+  const auto& featureIds = m_DataStructure.getDataAs<IDataArray>(m_InputValues->FeatureIdsArrayPath)->getIDataStoreRefAs<DataStore<int32>>();
   const usize totalPoints = featureIds.getNumberOfTuples();
 
   if(m_InputValues->WriteBinaryFile)
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp
index 092e0c46a7..eb2e62e36c 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp
@@ -87,7 +87,7 @@ Result<> WriteAvizoUniformCoordinate::writeData(FILE* outputFile) const
 {
   fprintf(outputFile, "@1\n");
 
-  const auto& featureIds = m_DataStructure.getDataAs<Int32Array>(m_InputValues->FeatureIdsArrayPath)->getIDataStoreRefAs<DataStore<int32>>();
+  const auto& featureIds = m_DataStructure.getDataAs<IDataArray>(m_InputValues->FeatureIdsArrayPath)->getIDataStoreRefAs<DataStore<int32>>();
   const usize totalPoints = featureIds.getNumberOfTuples();
 
   if(m_InputValues->WriteBinaryFile)
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.cpp
index 4a71085c15..698a0a0d2d 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeDifferencesMapFilter.cpp
@@ -83,9 +83,9 @@ struct ExecuteFindDifferenceMapFunctor
   {
     using store_type = AbstractDataStore<DataType>;
 
-    auto& firstArray = firstArrayPtr->getIDataStoreRefAs<store_type>();
-    auto& secondArray = secondArrayPtr->getIDataStoreRefAs<store_type>();
-    auto& differenceMap = differenceMapPtr->getIDataStoreRefAs<store_type>();
+    auto& firstArray = firstArrayPtr->template getIDataStoreRefAs<store_type>();
+    auto& secondArray = secondArrayPtr->template getIDataStoreRefAs<store_type>();
+    auto& differenceMap = differenceMapPtr->template getIDataStoreRefAs<store_type>();
 
     usize numTuples = firstArray.getNumberOfTuples();
     int32 numComps = firstArray.getNumberOfComponents();
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.cpp
index 17a13c746d..b32b95b865 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.cpp
@@ -35,7 +35,7 @@ struct ReplaceValueInArrayFunctor
   template <typename ScalarType>
   void operator()(IDataArray& workingArray, const std::string& removeValue, const std::string& replaceValue)
   {
-    auto& dataStore = workingArray.getIDataStoreRefAs<AbstractDataStore<ScalarType>>();
+    auto& dataStore = workingArray.template getIDataStoreRefAs<AbstractDataStore<ScalarType>>();
 
     auto removeVal = convertFromStringToType<ScalarType>(removeValue);
     auto replaceVal = convertFromStringToType<ScalarType>(replaceValue);
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.cpp
index f6fdbf8ce5..b96a8797da 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.cpp
@@ -24,9 +24,9 @@ class CopyFeatureArrayToElementArrayImpl
   using StoreType = AbstractDataStore<T>;
 
   CopyFeatureArrayToElementArrayImpl(const IDataArray* selectedFeatureArray, const Int32AbstractDataStore& featureIdsStore, IDataArray* createdArray, const std::atomic_bool& shouldCancel)
-  : m_SelectedFeature(selectedFeatureArray->getIDataStoreRefAs<StoreType>())
+  : m_SelectedFeature(selectedFeatureArray->template getIDataStoreRefAs<StoreType>())
   , m_FeatureIdsStore(featureIdsStore)
-  , m_CreatedStore(createdArray->getIDataStoreRefAs<StoreType>())
+  , m_CreatedStore(createdArray->template getIDataStoreRefAs<StoreType>())
   , m_ShouldCancel(shouldCancel)
   {
   }
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp
index 06e6da3bef..b93e305e5c 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp
@@ -28,7 +28,7 @@ struct CreateAndInitArrayFunctor
   {
     Result<T> result = ConvertTo<T>::convert(initValue);
 
-    auto* dataStore = iDataArray->getIDataStoreAs<AbstractDataStore<T>>();
+    auto* dataStore = iDataArray->template getIDataStoreAs<AbstractDataStore<T>>();
     dataStore->fill(result.value());
   }
 };
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp
index 3c6a0fb7d0..fe0e860dcf 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp
@@ -20,8 +20,8 @@ struct CopyCellDataFunctor
   template <typename T>
   Result<> operator()(const IDataArray* selectedCellArray, const Int32AbstractDataStore& featureIds, IDataArray* createdArray, const std::atomic_bool& shouldCancel)
   {
-    const auto& selectedCellStore = selectedCellArray->getIDataStoreRefAs<AbstractDataStore<T>>();
-    auto& createdDataStore = createdArray->getIDataStoreRefAs<AbstractDataStore<T>>();
+    const auto& selectedCellStore = selectedCellArray->template getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& createdDataStore = createdArray->template getIDataStoreRefAs<AbstractDataStore<T>>();
 
     // Initialize the output array with a default value
     createdDataStore.fill(0);
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.cpp
index dcdc0b92a8..b4b47b87e9 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.cpp
@@ -71,8 +71,8 @@ class CropImageGeomDataArray
 {
 public:
   CropImageGeomDataArray(const IDataArray& oldCellArray, IDataArray& newCellArray, const ImageGeom& srcImageGeom, std::array<uint64, 6> bounds, const std::atomic_bool& shouldCancel)
-  : m_OldCellStore(oldCellArray.getIDataStoreRefAs<AbstractDataStore<T>>())
-  , m_NewCellStore(newCellArray.getIDataStoreRefAs<AbstractDataStore<T>>())
+  : m_OldCellStore(oldCellArray.template getIDataStoreRefAs<AbstractDataStore<T>>())
+  , m_NewCellStore(newCellArray.template getIDataStoreRefAs<AbstractDataStore<T>>())
   , m_SrcImageGeom(srcImageGeom)
   , m_Bounds(bounds)
   , m_ShouldCancel(shouldCancel)
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.cpp
index 792cbc076f..95ad1c725d 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.cpp
@@ -21,8 +21,8 @@ struct CopyDataToCroppedGeometryFunctor
   template <typename T>
   void operator()(const IDataArray* inDataRef, IDataArray* outDataRef, const std::vector<int64>& croppedPoints)
   {
-    const auto& inputData = inDataRef->getIDataStoreRefAs<AbstractDataStore<T>>();
-    auto& croppedData = outDataRef->getIDataStoreRefAs<AbstractDataStore<T>>();
+    const auto& inputData = inDataRef->template getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& croppedData = outDataRef->template getIDataStoreRefAs<AbstractDataStore<T>>();
 
     usize nComps = inDataRef->getNumberOfComponents();
 
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.cpp
index 7bd105fb5a..e90f0ebca9 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.cpp
@@ -38,8 +38,8 @@ struct CopyDataFunctor
   template <typename T>
   void operator()(IDataArray* inDataPtr, IDataArray* outDataPtr, std::unordered_map<int64, int64>& elementMap) const
   {
-    auto& inputData = inDataPtr->getIDataStoreRefAs<AbstractDataStore<T>>();
-    auto& outputData = outDataPtr->getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& inputData = inDataPtr->template getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& outputData = outDataPtr->template getIDataStoreRefAs<AbstractDataStore<T>>();
 
     usize nTuples = outDataPtr->getNumberOfTuples();
     usize nComps = inDataPtr->getNumberOfComponents();
@@ -64,8 +64,8 @@ struct RemoveFlaggedVerticesFunctor
   template <class T>
   void operator()(IDataArray* inputDataPtr, IDataArray* outputDataArray, const std::vector<IGeometry::MeshIndexType>& indexMapping) const
   {
-    auto& inputData = inputDataPtr->getIDataStoreRefAs<AbstractDataStore<T>>();
-    auto& outputData = outputDataArray->getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& inputData = inputDataPtr->template getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& outputData = outputDataArray->template getIDataStoreRefAs<AbstractDataStore<T>>();
     usize nComps = inputData.getNumberOfComponents();
     IGeometry::MeshIndexType notSeen = std::numeric_limits<IGeometry::MeshIndexType>::max();
 
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.cpp
index 3bfbaf93d4..a3d0190df5 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.cpp
@@ -18,7 +18,7 @@ struct IdentifySampleFunctor
   void operator()(const ImageGeom* imageGeom, IDataArray* goodVoxelsPtr, bool fillHoles)
   {
     std::vector<usize> cDims = {1};
-    auto& goodVoxels = goodVoxelsPtr->getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& goodVoxels = goodVoxelsPtr->template getIDataStoreRefAs<AbstractDataStore<T>>();
 
     const auto totalPoints = static_cast<int64>(goodVoxelsPtr->getNumberOfTuples());
 
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.cpp
index f6e637dc72..c7867427a1 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.cpp
@@ -292,7 +292,7 @@ struct FillArrayFunctor
   template <typename T>
   void operator()(IDataArray& iDataArray, const InitializeDataInputValues& inputValues)
   {
-    auto& dataStore = iDataArray.getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& dataStore = iDataArray.template getIDataStoreRefAs<AbstractDataStore<T>>();
     usize numComp = dataStore.getNumberOfComponents(); // We checked that the values string is greater than max comps size so proceed check free
 
     switch(inputValues.initType)
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.cpp
index 364ccfdaf4..4704026470 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.cpp
@@ -119,7 +119,7 @@ struct InitializeArrayFunctor
       rangeMax = std::numeric_limits<T>().max();
     }
 
-    auto& dataStore = dataArray.getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& dataStore = dataArray.template getIDataStoreRefAs<AbstractDataStore<T>>();
 
     auto&& [distribution, generator] = CreateRandomGenerator(rangeMin, rangeMax, seed);
 
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp
index eaa520bea0..e01d00b559 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp
@@ -30,7 +30,7 @@ struct MapPointCloudDataByKernelFunctor
   template <typename T>
   void operator()(IDataArray* source, INeighborList* dynamic, std::vector<float>& kernelVals, const int64 kernel[3], const usize dims[3], usize curX, usize curY, usize curZ, usize vertIdx)
   {
-    auto& inputData = source->getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& inputData = source->template getIDataStoreRefAs<AbstractDataStore<T>>();
     auto* interpolatedDataPtr = dynamic_cast<NeighborList<T>*>(dynamic);
 
     usize index = 0;
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.cpp
index 308a50afb3..1cc704a041 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.cpp
@@ -130,7 +130,7 @@ struct ExecuteThresholdHelper
   template <typename Type, typename MaskType>
   void operator()(ThresholdFilterHelper<MaskType>& helper, const IDataArray* iDataArray, Type trueValue, Type falseValue)
   {
-    const auto& dataStore = iDataArray->getIDataStoreRefAs<AbstractDataStore<Type>>();
+    const auto& dataStore = iDataArray->template getIDataStoreRefAs<AbstractDataStore<Type>>();
     helper.template filterData<Type>(dataStore, trueValue, falseValue);
   }
 };
@@ -218,7 +218,7 @@ struct ThresholdValueFunctor
   {
     // Traditionally we would do a check to ensure we get a valid pointer, I'm forgoing that check because it
     // was essentially done in the preflight part.
-    ThresholdValue(comparisonValue, dataStructure, outputResultArray->getIDataStoreRefAs<AbstractDataStore<T>>(), err, replaceInput, inverse, trueValue, falseValue);
+    ThresholdValue(comparisonValue, dataStructure, outputResultArray->template getIDataStoreRefAs<AbstractDataStore<T>>(), err, replaceInput, inverse, trueValue, falseValue);
   }
 };
 
@@ -287,7 +287,7 @@ struct ThresholdSetFunctor
 
     // Traditionally we would do a check to ensure we get a valid pointer, I'm forgoing that check because it
     // was essentially done in the preflight part.
-    ThresholdSet<T>(inputComparisonSet, dataStructure, outputResultArray->getIDataStoreRefAs<AbstractDataStore<T>>(), err, replaceInput, inverse, trueValue, falseValue);
+    ThresholdSet<T>(inputComparisonSet, dataStructure, outputResultArray->template getIDataStoreRefAs<AbstractDataStore<T>>(), err, replaceInput, inverse, trueValue, falseValue);
   }
 };
 
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp
index 2fc6e278ba..5c5f0be9e3 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp
@@ -28,7 +28,7 @@ struct CSVReadFileFunctor
   template <typename T>
   Result<> operator()(IDataArray* inputIDataArray, const fs::path& inputFilePath, uint64 skipLines, char delimiter)
   {
-    auto& store = inputIDataArray->getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& store = inputIDataArray->template getIDataStoreRefAs<AbstractDataStore<T>>();
     return CsvParser::ReadFile<T>(inputFilePath, store, skipLines, delimiter);
   }
 };
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.cpp
index 7f7f50fe7d..54df4afc59 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.cpp
@@ -32,8 +32,8 @@ struct RemoveFlaggedVerticesFunctor
   template <class T>
   void operator()(const IDataArray& sourceIDataArray, IDataArray& destIDataArray, const std::unique_ptr<MaskCompare>& maskCompare, size_t numVerticesToKeep) const
   {
-    const auto& sourceDataStore = sourceIDataArray.getIDataStoreRefAs<AbstractDataStore<T>>();
-    auto& destinationDataStore = destIDataArray.getIDataStoreRefAs<AbstractDataStore<T>>();
+    const auto& sourceDataStore = sourceIDataArray.template getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& destinationDataStore = destIDataArray.template getIDataStoreRefAs<AbstractDataStore<T>>();
     destinationDataStore.resizeTuples({numVerticesToKeep});
 
     const usize numInputTuples = sourceDataStore.getNumberOfTuples();
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.cpp
index f8ea7aa681..99227fa5f2 100644
--- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.cpp
+++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.cpp
@@ -22,7 +22,7 @@ struct FindThresholdFunctor
   template <class T>
   void operator()(const IDataArray* inputObject, const Float32AbstractDataStore& gradMag, BoolAbstractDataStore& maskStore)
   {
-    const auto& inputData = inputObject->getIDataStoreRefAs<AbstractDataStore<T>>();
+    const auto& inputData = inputObject->template getIDataStoreRefAs<AbstractDataStore<T>>();
     usize numTuples = inputData.getNumberOfTuples();
     float numerator = 0;
     float denominator = 0;
diff --git a/src/simplnx/Utilities/ImageRotationUtilities.hpp b/src/simplnx/Utilities/ImageRotationUtilities.hpp
index 4c9257e612..ded74afb50 100644
--- a/src/simplnx/Utilities/ImageRotationUtilities.hpp
+++ b/src/simplnx/Utilities/ImageRotationUtilities.hpp
@@ -401,7 +401,7 @@ class RotateImageGeometryWithTrilinearInterpolation
 
     m_FilterCallback->sendThreadSafeProgressMessage(fmt::format("{}: Transform Starting", sourceArray.getName()));
 
-    auto& newDataStore = m_TargetArray->getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& newDataStore = m_TargetArray->template getIDataStoreRefAs<AbstractDataStore<T>>();
 
     DataStructure tempDataStructure;
     ImageGeom* origImageGeomPtr = ImageGeom::Create(tempDataStructure, "Temp");
diff --git a/src/simplnx/Utilities/OStreamUtilities.cpp b/src/simplnx/Utilities/OStreamUtilities.cpp
index 1fef391315..6ccc78078e 100644
--- a/src/simplnx/Utilities/OStreamUtilities.cpp
+++ b/src/simplnx/Utilities/OStreamUtilities.cpp
@@ -142,7 +142,7 @@ struct PrintDataArray
   Result<> operator()(std::ostream& outputStrm, IDataArray* inputDataArray, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, const std::string& delimiter = ",",
                       int32 componentsPerLine = 0)
   {
-    auto& dataStore = inputDataArray->getIDataStoreRefAs<AbstractDataStore<ScalarType>>();
+    auto& dataStore = inputDataArray->template getIDataStoreRefAs<AbstractDataStore<ScalarType>>();
     auto start = std::chrono::steady_clock::now();
     auto numTuples = dataStore.getNumberOfTuples();
     auto maxLine = static_cast<size_t>(componentsPerLine);
@@ -276,7 +276,7 @@ class TupleWriter : public ITupleWriter
 
 public:
   TupleWriter(const IDataArray& iDataArray, const std::string& delimiter)
-  : m_DataStore(iDataArray.getIDataStoreRefAs<AbstractDataStore<ScalarType>>())
+  : m_DataStore(iDataArray.template getIDataStoreRefAs<AbstractDataStore<ScalarType>>())
   , m_Name(iDataArray.getName())
   , m_Delimiter(delimiter)
   {
diff --git a/test/UnitTestCommon/include/simplnx/UnitTest/UnitTestCommon.hpp b/test/UnitTestCommon/include/simplnx/UnitTest/UnitTestCommon.hpp
index 27b03cecd1..a3576cc674 100644
--- a/test/UnitTestCommon/include/simplnx/UnitTest/UnitTestCommon.hpp
+++ b/test/UnitTestCommon/include/simplnx/UnitTest/UnitTestCommon.hpp
@@ -452,8 +452,8 @@ inline void CompareMontage(const AbstractMontage& exemplar, const AbstractMontag
 template <typename T>
 void CompareDataArrays(const IDataArray& left, const IDataArray& right, usize start = 0)
 {
-  const auto& oldDataStore = left.getIDataStoreRefAs<AbstractDataStore<T>>();
-  const auto& newDataStore = right.getIDataStoreRefAs<AbstractDataStore<T>>();
+  const auto& oldDataStore = left.template getIDataStoreRefAs<AbstractDataStore<T>>();
+  const auto& newDataStore = right.template getIDataStoreRefAs<AbstractDataStore<T>>();
   usize end = oldDataStore.getSize();
   INFO(fmt::format("Input Data Array:'{}'  Output DataArray: '{}' bad comparison", left.getName(), right.getName()));
   T oldVal;