diff --git a/pom.xml b/pom.xml
index cc2e50b88..cb4d87bae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.amazon.deequ</groupId>
     <artifactId>deequ</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2-spark-3.1</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -20,7 +20,7 @@
         <scala-maven-plugin.version>4.4.0</scala-maven-plugin.version>
 
         <!-- Spark (select 2.2.3, 2.3.4, 2.4.7, or 3.0.1) -->
-        <spark.version>2.4.7</spark.version>
+        <spark.version>3.1.1</spark.version>
     </properties>
 
     <name>deequ</name>
diff --git a/src/main/scala/com/amazon/deequ/analyzers/catalyst/StatefulCorrelation.scala b/src/main/scala/com/amazon/deequ/analyzers/catalyst/StatefulCorrelation.scala
index b8f517f0e..5e6e82a34 100644
--- a/src/main/scala/com/amazon/deequ/analyzers/catalyst/StatefulCorrelation.scala
+++ b/src/main/scala/com/amazon/deequ/analyzers/catalyst/StatefulCorrelation.scala
@@ -21,7 +21,11 @@ import org.apache.spark.sql.catalyst.expressions._
 import org.apache.spark.sql.types._
 
 /** Adjusted version of org.apache.spark.sql.catalyst.expressions.aggregate.Corr */
-private[sql] class StatefulCorrelation(x: Expression, y: Expression) extends Corr(x, y) {
+private[sql] class StatefulCorrelation(
+  x: Expression,
+  y: Expression,
+  nullOnDivideByZero: Boolean = false
+) extends Corr(x, y, nullOnDivideByZero) {
 
   override def dataType: org.apache.spark.sql.types.DataType =
     StructType(StructField("n", DoubleType) :: StructField("xAvg", DoubleType) ::
diff --git a/src/main/scala/com/amazon/deequ/analyzers/catalyst/StatefulStdDevPop.scala b/src/main/scala/com/amazon/deequ/analyzers/catalyst/StatefulStdDevPop.scala
index f082cc709..4d24ad244 100644
--- a/src/main/scala/com/amazon/deequ/analyzers/catalyst/StatefulStdDevPop.scala
+++ b/src/main/scala/com/amazon/deequ/analyzers/catalyst/StatefulStdDevPop.scala
@@ -21,7 +21,10 @@ import org.apache.spark.sql.catalyst.expressions.aggregate.CentralMomentAgg
 import org.apache.spark.sql.types._
 
 /** Adjusted version of org.apache.spark.sql.catalyst.expressions.aggregate.StddevPop */
-private[sql] case class StatefulStdDevPop(child: Expression) extends CentralMomentAgg(child) {
+private[sql] case class StatefulStdDevPop(
+  child: Expression,
+  nullOnDivideByZero: Boolean = false
+) extends CentralMomentAgg(child, nullOnDivideByZero) {
 
   override protected def momentOrder = 2