diff --git a/pom.xml b/pom.xml
index b215677..46fa1b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
         <version.common-utils>1.1</version.common-utils>
         <version.commons-lang3>3.9</version.commons-lang3>
         <version.commons-net>3.6</version.commons-net>
-        <version.geowave>1.1.0</version.geowave>
+        <version.geowave>2.0.1</version.geowave>
         <version.hadoop>2.6.0-cdh5.9.1</version.hadoop>
         <version.jts>1.19.0</version.jts>
         <version.protostuff>1.6.2</version.protostuff>
@@ -127,6 +127,10 @@
                         <artifactId>commons-lang3</artifactId>
                         <groupId>org.apache.commons</groupId>
                     </exclusion>
+                    <exclusion>
+                        <artifactId>*</artifactId>
+                        <groupId>org.eclipse.emf</groupId>
+                    </exclusion>
                     <exclusion>
                         <artifactId>bcprov-jdk15on</artifactId>
                         <groupId>org.bouncycastle</groupId>
@@ -226,5 +230,10 @@
             <id>cloudera</id>
             <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
         </repository>
+        <repository>
+            <id>geosolutions</id>
+            <name>GeoSolutions Repository</name>
+            <url>https://maven.geo-solutions.it</url>
+        </repository>
     </repositories>
 </project>
diff --git a/src/main/java/datawave/data/normalizer/AbstractGeometryNormalizer.java b/src/main/java/datawave/data/normalizer/AbstractGeometryNormalizer.java
index 9a4f55f..2d3295c 100644
--- a/src/main/java/datawave/data/normalizer/AbstractGeometryNormalizer.java
+++ b/src/main/java/datawave/data/normalizer/AbstractGeometryNormalizer.java
@@ -4,7 +4,7 @@
 import org.apache.commons.codec.binary.Hex;
 import org.locationtech.geowave.core.geotime.util.GeometryUtils;
 import org.locationtech.geowave.core.index.NumericIndexStrategy;
-import org.locationtech.geowave.core.index.sfc.data.MultiDimensionalNumericData;
+import org.locationtech.geowave.core.index.numeric.MultiDimensionalNumericData;
 import org.locationtech.geowave.core.store.api.Index;
 import org.locationtech.jts.geom.Geometry;
 
diff --git a/src/test/java/datawave/data/normalizer/GeometryNormalizerTest.java b/src/test/java/datawave/data/normalizer/GeometryNormalizerTest.java
index b9b49a8..e9618de 100644
--- a/src/test/java/datawave/data/normalizer/GeometryNormalizerTest.java
+++ b/src/test/java/datawave/data/normalizer/GeometryNormalizerTest.java
@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.Test;
 import org.locationtech.geowave.core.geotime.util.GeometryUtils;
 import org.locationtech.geowave.core.index.ByteArrayRange;
-import org.locationtech.geowave.core.index.sfc.data.MultiDimensionalNumericData;
+import org.locationtech.geowave.core.index.numeric.MultiDimensionalNumericData;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.GeometryFactory;
diff --git a/src/test/java/datawave/data/normalizer/PointNormalizerTest.java b/src/test/java/datawave/data/normalizer/PointNormalizerTest.java
index ef66eab..9cf0995 100644
--- a/src/test/java/datawave/data/normalizer/PointNormalizerTest.java
+++ b/src/test/java/datawave/data/normalizer/PointNormalizerTest.java
@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.Test;
 import org.locationtech.geowave.core.geotime.util.GeometryUtils;
 import org.locationtech.geowave.core.index.ByteArrayRange;
-import org.locationtech.geowave.core.index.sfc.data.MultiDimensionalNumericData;
+import org.locationtech.geowave.core.index.numeric.MultiDimensionalNumericData;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.GeometryFactory;