diff --git a/.github/workflows/build-scala2.11-spark2.4.yml b/.github/workflows/build-scala2.11-spark2.4.yml
deleted file mode 100644
index 0cb81b48..00000000
--- a/.github/workflows/build-scala2.11-spark2.4.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Build Scala 2.11, Spark 2.4
-
-on:
-  push:
-    branches: [ master, branch-3.2 ]
-  pull_request:
-    branches: [ master, branch-3.2 ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Run tests
-      run: mvn clean test -Plicense-check,spark-2.4,scala-2.11
diff --git a/.github/workflows/build-scala2.12-spark2.4.yml b/.github/workflows/build-scala2.12-spark2.4.yml
deleted file mode 100644
index 80af1828..00000000
--- a/.github/workflows/build-scala2.12-spark2.4.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Build Scala 2.12, Spark 2.4
-
-on:
-  push:
-    branches: [ master, branch-3.2 ]
-  pull_request:
-    branches: [ master, branch-3.2 ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Run tests
-      run: mvn clean test -Plicense-check,spark-2.4,scala-2.12
diff --git a/.github/workflows/build-scala2.12-spark3.0.yml b/.github/workflows/build-scala2.12-spark3.0.yml
deleted file mode 100644
index 80286455..00000000
--- a/.github/workflows/build-scala2.12-spark3.0.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Build Scala 2.12, Spark 3.0
-
-on:
-  push:
-    branches: [ master, branch-3.2 ]
-  pull_request:
-    branches: [ master, branch-3.2 ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Run tests
-      run: mvn clean test -Plicense-check,spark-3.0,scala-2.12
diff --git a/.github/workflows/build-scala2.12-spark3.1.yml b/.github/workflows/build-scala2.12-spark3.1.yml
deleted file mode 100644
index 4a36fde7..00000000
--- a/.github/workflows/build-scala2.12-spark3.1.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Build Scala 2.12, Spark 3.1
-
-on:
-  push:
-    branches: [ master, branch-3.2 ]
-  pull_request:
-    branches: [ master, branch-3.2 ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Run tests
-      run: mvn clean test -Plicense-check,spark-3.1,scala-2.12
diff --git a/.github/workflows/build-scala2.11-spark2.3.yml b/.github/workflows/build-scala2.12-spark3.2.yml
similarity index 58%
rename from .github/workflows/build-scala2.11-spark2.3.yml
rename to .github/workflows/build-scala2.12-spark3.2.yml
index 8a1d1dcf..2858ef99 100644
--- a/.github/workflows/build-scala2.11-spark2.3.yml
+++ b/.github/workflows/build-scala2.12-spark3.2.yml
@@ -1,10 +1,10 @@
-name: Build Scala 2.11, Spark 2.3
+name: Build Scala 2.12, Spark 3.2
 
 on:
   push:
-    branches: [ master, branch-3.2 ]
+    branches: [ master ]
   pull_request:
-    branches: [ master, branch-3.2 ]
+    branches: [ master ]
 
 jobs:
   build:
@@ -18,4 +18,4 @@ jobs:
       with:
         java-version: 1.8
     - name: Run tests
-      run: mvn clean test -Plicense-check,spark-2.3,scala-2.11
+      run: mvn clean test -Plicense-check,spark-3.2,scala-2.12
diff --git a/.github/workflows/compatibility-check.yml b/.github/workflows/compatibility-check.yml
index fb7ece4a..8648bc61 100644
--- a/.github/workflows/compatibility-check.yml
+++ b/.github/workflows/compatibility-check.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scala: [ 2.11, 2.12 ]
+        scala: [ 2.12 ]
     name: Scala ${{ matrix.scala }}
     steps:
       - uses: actions/checkout@v2
diff --git a/pom.xml b/pom.xml
index f930f4f3..7ae33a08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,19 +48,13 @@
         <maven.shade.plugin.version>3.2.1</maven.shade.plugin.version>
 
         <!-- Spark -->
-        <spark-23.version>2.3.4</spark-23.version>
-        <spark-24.version>2.4.8</spark-24.version>
-        <spark-30.version>3.0.3</spark-30.version>
-        <spark-31.version>3.1.2</spark-31.version>
-
-
+        <spark-32.version>3.2.0</spark-32.version>
 
         <!-- Cross build properties -->
 
         <default.scala.compat.version>2.12</default.scala.compat.version>
         <default.scala.version>${scala_2.12.version}</default.scala.version>
 
-        <scala_2.11.version>2.11.12</scala_2.11.version>
         <scala_2.12.version>2.12.10</scala_2.12.version>
 
         <!-- Controlled by `scala-cross-build` plugin -->
@@ -68,13 +62,13 @@
         <scala.compat.version>2.12</scala.compat.version>
 
         <!--Platforms-->
-        <spark.version>${spark-24.version}</spark.version>
+        <spark.version>${spark-32.version}</spark.version>
         <spark.avro.version>${spark.version}</spark.avro.version>
         <kafka.spark.version>0-10</kafka.spark.version>
-        <confluent.version>5.3.4</confluent.version>
+        <confluent.version>6.2.1</confluent.version>
 
         <!--Libs-->
-        <avro.version>1.8.2</avro.version>
+        <avro.version>1.10.2</avro.version>
 
         <!--Tests-->
         <scalatestplus.mockito.version>3.1.0.0</scalatestplus.mockito.version>
@@ -109,18 +103,18 @@
     </organization>
 
     <developers>
-        <developer>
-            <id>felipemmelo</id>
-            <name>Felipe Melo</name>
-            <timezone>Europe/Prague</timezone>
-            <url>https://github.com/felipemmelo</url>
-        </developer>
         <developer>
             <id>cerveada</id>
             <name>Adam Cervenka</name>
             <timezone>Europe/Prague</timezone>
             <url>https://github.com/cerveada</url>
         </developer>
+        <developer>
+            <id>kevinwallimann</id>
+            <name>Kevin Wallimann</name>
+            <timezone>Europe/Prague</timezone>
+            <url>https://github.com/kevinwallimann</url>
+        </developer>
     </developers>
 
     <dependencies>
@@ -305,13 +299,6 @@
     <profiles>
 
         <!-- Cross-building profiles -->
-        <profile>
-            <id>scala-2.11</id>
-            <properties>
-                <scala.compat.version>2.11</scala.compat.version>
-                <scala.version>${scala_2.11.version}</scala.version>
-            </properties>
-        </profile>
         <profile>
             <id>scala-2.12</id>
             <properties>
@@ -322,36 +309,11 @@
 
         <!-- Spark profiles -->
         <profile>
-            <id>spark-2.3</id>
-            <properties>
-                <spark.version>${spark-23.version}</spark.version>
-                <spark.avro.version>${spark-24.version}</spark.avro.version>
-                <avro.version>1.8.2</avro.version>
-                <confluent.version>5.3.4</confluent.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>spark-2.4</id>
-            <properties>
-                <spark.version>${spark-24.version}</spark.version>
-                <avro.version>1.8.2</avro.version>
-                <confluent.version>5.3.4</confluent.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>spark-3.0</id>
-            <properties>
-                <spark.version>${spark-30.version}</spark.version>
-                <avro.version>1.8.2</avro.version>
-                <confluent.version>5.3.4</confluent.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>spark-3.1</id>
+            <id>spark-3.2</id>
             <properties>
-                <spark.version>${spark-31.version}</spark.version>
-                <avro.version>1.8.2</avro.version>
-                <confluent.version>5.3.4</confluent.version>
+                <spark.version>${spark-32.version}</spark.version>
+                <avro.version>1.10.2</avro.version>
+                <confluent.version>6.2.1</confluent.version>
             </properties>
         </profile>
 
diff --git a/src/main/scala/za/co/absa/abris/avro/sql/AvroDataToCatalyst.scala b/src/main/scala/za/co/absa/abris/avro/sql/AvroDataToCatalyst.scala
index c4a2461f..31e8644f 100644
--- a/src/main/scala/za/co/absa/abris/avro/sql/AvroDataToCatalyst.scala
+++ b/src/main/scala/za/co/absa/abris/avro/sql/AvroDataToCatalyst.scala
@@ -164,4 +164,8 @@ private[abris] case class AvroDataToCatalyst(
     result = vanillaReader.read(result, decoder)
     result
   }
+
+  override protected def withNewChildInternal(newChild: Expression): Expression =
+    copy(child = newChild)
+
 }
diff --git a/src/main/scala/za/co/absa/abris/avro/sql/CatalystDataToAvro.scala b/src/main/scala/za/co/absa/abris/avro/sql/CatalystDataToAvro.scala
index cfbf17f4..3f92f714 100644
--- a/src/main/scala/za/co/absa/abris/avro/sql/CatalystDataToAvro.scala
+++ b/src/main/scala/za/co/absa/abris/avro/sql/CatalystDataToAvro.scala
@@ -73,4 +73,7 @@ private[abris] case class CatalystDataToAvro(
     defineCodeGen(ctx, ev, input =>
       s"(byte[]) $expr.nullSafeEval($input)")
   }
+
+  override protected def withNewChildInternal(newChild: Expression): Expression =
+    copy(child = newChild)
 }