diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b566beb7..f06f1069 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11' ]
+        java: [ '11', '17' ]
     name: Java ${{ matrix.java }} code analysis
     steps:
       - name: Checkout
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11' ]
+        java: [ '11', '17' ]
     name: Java ${{ matrix.java }} unit test
     steps:
       - name: Checkout
@@ -58,7 +58,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11' ]
+        java: [ '11', '17' ]
     name: Java ${{ matrix.java }} integration tests
     steps:
       - name: Checkout
diff --git a/common/pom.xml b/common/pom.xml
index 1ddbd4a8..292fa7e7 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -19,10 +19,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
-        <artifactId>parent_c4.1</artifactId>
+        <artifactId>parent_c5.0</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>common_c4.1</artifactId>
+    <artifactId>common_c5.0</artifactId>
     <packaging>jar</packaging>
 
     <name>Ericsson Cassandra Audit - Common</name>
diff --git a/ecaudit/pom.xml b/ecaudit/pom.xml
index e4392b61..500c7574 100644
--- a/ecaudit/pom.xml
+++ b/ecaudit/pom.xml
@@ -19,10 +19,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
-        <artifactId>parent_c4.1</artifactId>
+        <artifactId>parent_c5.0</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>ecaudit_c4.1</artifactId>
+    <artifactId>ecaudit_c5.0</artifactId>
     <packaging>jar</packaging>
 
     <name>Ericsson Cassandra Audit - Plug-in</name>
diff --git a/ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/entry/CqlLiteralFlavorAdapter.java b/ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/entry/CqlLiteralFlavorAdapter.java
index c5297dde..0e9ca759 100644
--- a/ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/entry/CqlLiteralFlavorAdapter.java
+++ b/ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/entry/CqlLiteralFlavorAdapter.java
@@ -18,7 +18,6 @@
 import java.nio.ByteBuffer;
 
 import org.apache.cassandra.cql3.ColumnSpecification;
-import org.apache.cassandra.transport.ProtocolVersion;
 
 /**
  * This logic is extracted to a flavor specific adapter.
@@ -35,6 +34,6 @@ private CqlLiteralFlavorAdapter()
 
     static String toCQLLiteral(ByteBuffer serializedValue, ColumnSpecification column)
     {
-        return column.type.asCQL3Type().toCQLLiteral(serializedValue, ProtocolVersion.CURRENT);
+        return column.type.asCQL3Type().toCQLLiteral(serializedValue);
     }
 }
diff --git a/ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/auth/TestSchemaHelper.java b/ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/auth/TestSchemaHelper.java
index bbe74228..e4e46de3 100644
--- a/ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/auth/TestSchemaHelper.java
+++ b/ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/auth/TestSchemaHelper.java
@@ -115,7 +115,7 @@ public void testSyncTimeout() throws UnknownHostException
         assertWaitTimeInMillis(startTime, RETRY_INTERVAL_MILLIS);
     }
 
-    @Test(timeout = (2 * RETRY_INTERVAL_MILLIS) - 1)
+    @Test(timeout = (3 * RETRY_INTERVAL_MILLIS) - 1)
     public void testNoLocalSchemaInFirstTry() throws UnknownHostException
     {
         givenLocalStateOrder(null, currentEndpointState);
diff --git a/ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/auth/TestWhitelistOptionParser.java b/ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/auth/TestWhitelistOptionParser.java
index 0f5dfdba..e6c8e581 100644
--- a/ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/auth/TestWhitelistOptionParser.java
+++ b/ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/auth/TestWhitelistOptionParser.java
@@ -98,7 +98,7 @@ public void testParseGrantModifyUppercaseAndSpace()
     public void testParseGrantAll()
     {
         Set<Permission> operations = parser.parseTargetOperation("grant_audit_whitelist_for_all", DataResource.fromName("data"));
-        assertThat(operations).containsExactlyInAnyOrder(Permission.CREATE, Permission.ALTER, Permission.DROP, Permission.SELECT, Permission.MODIFY, Permission.AUTHORIZE);
+        assertThat(operations).containsExactlyInAnyOrder(Permission.CREATE, Permission.ALTER, Permission.DROP, Permission.SELECT, Permission.MODIFY, Permission.AUTHORIZE, Permission.UNMASK, Permission.SELECT_MASKED);
     }
 
     @Test
diff --git a/ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/entry/TestCqlLiteralFlavorAdapter.java b/ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/entry/TestCqlLiteralFlavorAdapter.java
index 32080363..18c12db1 100644
--- a/ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/entry/TestCqlLiteralFlavorAdapter.java
+++ b/ecaudit/src/test/java/com/ericsson/bss/cassandra/ecaudit/entry/TestCqlLiteralFlavorAdapter.java
@@ -59,7 +59,7 @@ public Object[][] testToCQLLiteral_parameters()
             { TimestampType.instance, EMPTY_BUFFER, "null" },
             { UTF8Type.instance, UTF8Type.instance.fromString("Kalle"), "'Kalle'" },
             { AsciiType.instance, AsciiType.instance.fromString("Anka"), "'Anka'" },
-            { TimestampType.instance, TimestampType.instance.fromTimeInMillis(42), "1970-01-01T00:00:00.042Z" }, // 42 ms after EPOCH
+            { TimestampType.instance, TimestampType.instance.fromTimeInMillis(42), "'1970-01-01T00:00:00.042Z'" }, // 42 ms after EPOCH
             { BooleanType.instance, BooleanType.instance.fromString("True"), "true" },
             { BytesType.instance, BytesType.instance.fromString("AABBCCDD"), "0xaabbccdd" },
         };
diff --git a/eclog/pom.xml b/eclog/pom.xml
index 692852b5..fe40fa8b 100644
--- a/eclog/pom.xml
+++ b/eclog/pom.xml
@@ -19,10 +19,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
-        <artifactId>parent_c4.1</artifactId>
+        <artifactId>parent_c5.0</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>eclog_c4.1</artifactId>
+    <artifactId>eclog_c5.0</artifactId>
     <packaging>jar</packaging>
 
     <name>Ericsson Cassandra Audit - Log Tool</name>
diff --git a/integration-test-allow-all-authorizer/pom.xml b/integration-test-allow-all-authorizer/pom.xml
index 3eee2ea5..3d64d4c4 100644
--- a/integration-test-allow-all-authorizer/pom.xml
+++ b/integration-test-allow-all-authorizer/pom.xml
@@ -19,10 +19,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
-        <artifactId>parent_c4.1</artifactId>
+        <artifactId>parent_c5.0</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>integration-test-allow-all-authorizer_c4.1</artifactId>
+    <artifactId>integration-test-allow-all-authorizer_c5.0</artifactId>
 
     <name>Ericsson Cassandra Audit - Allow All Authorizer IT</name>
 
@@ -61,44 +61,6 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>jdk11</id>
-            <activation>
-                <jdk>11</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <configuration>
-                            <argLine>
-                                ${argLine}
-                                -Djdk.attach.allowAttachSelf=true
-                                --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
-                                --add-exports java.base/jdk.internal.ref=ALL-UNNAMED
-                                --add-exports java.base/sun.nio.ch=ALL-UNNAMED
-                                --add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED
-                                --add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED
-                                --add-exports java.rmi/sun.rmi.server=ALL-UNNAMED
-                                --add-exports java.sql/java.sql=ALL-UNNAMED
-                                --add-opens java.base/java.lang.module=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.math=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.module=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED
-                                --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
-                            </argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <build>
         <plugins>
             <plugin>
@@ -108,6 +70,36 @@
                 <configuration>
                     <forkCount>1</forkCount>
                     <reuseForks>true</reuseForks>
+                    <argLine>
+                        ${argLine}
+                        -Djdk.attach.allowAttachSelf=true
+                        --add-exports java.base/java.lang.ref=ALL-UNNAMED
+                        --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
+                        --add-exports java.base/jdk.internal.ref=ALL-UNNAMED
+                        --add-exports java.base/sun.nio.ch=ALL-UNNAMED
+                        --add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED
+                        --add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED
+                        --add-exports java.rmi/sun.rmi.server=ALL-UNNAMED
+                        --add-exports java.sql/java.sql=ALL-UNNAMED
+                        --add-exports jdk.attach/sun.tools.attach=ALL-UNNAMED
+                        --add-exports jdk.unsupported/sun.misc=ALL-UNNAMED
+                        --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens java.base/java.lang.module=ALL-UNNAMED
+                        --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                        --add-opens java.base/java.io=ALL-UNNAMED
+                        --add-opens java.base/java.nio=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.math=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.module=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED
+                        --add-opens java.base/sun.nio.ch=ALL-UNNAMED
+                        --add-opens jdk.compiler/com.sun.tools.javac=ALL-UNNAMED
+                        --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
+                    </argLine>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/integration-test-query-logger/pom.xml b/integration-test-query-logger/pom.xml
index e695ee8e..e0e4b0bf 100644
--- a/integration-test-query-logger/pom.xml
+++ b/integration-test-query-logger/pom.xml
@@ -19,10 +19,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
-        <artifactId>parent_c4.1</artifactId>
+        <artifactId>parent_c5.0</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>integration-test-query-logger_c4.1</artifactId>
+    <artifactId>integration-test-query-logger_c5.0</artifactId>
 
     <name>Ericsson Cassandra Audit - Query Logger IT</name>
 
@@ -61,44 +61,6 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>jdk11</id>
-            <activation>
-                <jdk>11</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <configuration>
-                            <argLine>
-                                ${argLine}
-                                -Djdk.attach.allowAttachSelf=true
-                                --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
-                                --add-exports java.base/jdk.internal.ref=ALL-UNNAMED
-                                --add-exports java.base/sun.nio.ch=ALL-UNNAMED
-                                --add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED
-                                --add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED
-                                --add-exports java.rmi/sun.rmi.server=ALL-UNNAMED
-                                --add-exports java.sql/java.sql=ALL-UNNAMED
-                                --add-opens java.base/java.lang.module=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.math=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.module=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED
-                                --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
-                            </argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <build>
         <plugins>
             <plugin>
@@ -108,6 +70,36 @@
                 <configuration>
                     <forkCount>1</forkCount>
                     <reuseForks>true</reuseForks>
+                    <argLine>
+                        ${argLine}
+                        -Djdk.attach.allowAttachSelf=true
+                        --add-exports java.base/java.lang.ref=ALL-UNNAMED
+                        --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
+                        --add-exports java.base/jdk.internal.ref=ALL-UNNAMED
+                        --add-exports java.base/sun.nio.ch=ALL-UNNAMED
+                        --add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED
+                        --add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED
+                        --add-exports java.rmi/sun.rmi.server=ALL-UNNAMED
+                        --add-exports java.sql/java.sql=ALL-UNNAMED
+                        --add-exports jdk.attach/sun.tools.attach=ALL-UNNAMED
+                        --add-exports jdk.unsupported/sun.misc=ALL-UNNAMED
+                        --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens java.base/java.lang.module=ALL-UNNAMED
+                        --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                        --add-opens java.base/java.io=ALL-UNNAMED
+                        --add-opens java.base/java.nio=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.math=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.module=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED
+                        --add-opens java.base/sun.nio.ch=ALL-UNNAMED
+                        --add-opens jdk.compiler/com.sun.tools.javac=ALL-UNNAMED
+                        --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
+                    </argLine>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/integration-test-standard/pom.xml b/integration-test-standard/pom.xml
index 3e9fd805..9ee745c3 100644
--- a/integration-test-standard/pom.xml
+++ b/integration-test-standard/pom.xml
@@ -19,10 +19,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
-        <artifactId>parent_c4.1</artifactId>
+        <artifactId>parent_c5.0</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>integration-test-standard_c4.1</artifactId>
+    <artifactId>integration-test-standard_c5.0</artifactId>
 
     <name>Ericsson Cassandra Audit - Standard IT</name>
 
@@ -71,44 +71,6 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>jdk11</id>
-            <activation>
-                <jdk>11</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <configuration>
-                            <argLine>
-                                ${argLine}
-                                -Djdk.attach.allowAttachSelf=true
-                                --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
-                                --add-exports java.base/jdk.internal.ref=ALL-UNNAMED
-                                --add-exports java.base/sun.nio.ch=ALL-UNNAMED
-                                --add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED
-                                --add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED
-                                --add-exports java.rmi/sun.rmi.server=ALL-UNNAMED
-                                --add-exports java.sql/java.sql=ALL-UNNAMED
-                                --add-opens java.base/java.lang.module=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.math=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.module=ALL-UNNAMED
-                                --add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED
-                                --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
-                            </argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <build>
         <plugins>
             <plugin>
@@ -118,6 +80,36 @@
                 <configuration>
                     <forkCount>2</forkCount>
                     <reuseForks>true</reuseForks>
+                    <argLine>
+                        ${argLine}
+                        -Djdk.attach.allowAttachSelf=true
+                        --add-exports java.base/java.lang.ref=ALL-UNNAMED
+                        --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
+                        --add-exports java.base/jdk.internal.ref=ALL-UNNAMED
+                        --add-exports java.base/sun.nio.ch=ALL-UNNAMED
+                        --add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED
+                        --add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED
+                        --add-exports java.rmi/sun.rmi.server=ALL-UNNAMED
+                        --add-exports java.sql/java.sql=ALL-UNNAMED
+                        --add-exports jdk.attach/sun.tools.attach=ALL-UNNAMED
+                        --add-exports jdk.unsupported/sun.misc=ALL-UNNAMED
+                        --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens java.base/java.lang.module=ALL-UNNAMED
+                        --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                        --add-opens java.base/java.io=ALL-UNNAMED
+                        --add-opens java.base/java.nio=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.math=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.module=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED
+                        --add-opens java.base/sun.nio.ch=ALL-UNNAMED
+                        --add-opens jdk.compiler/com.sun.tools.javac=ALL-UNNAMED
+                        --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
+                    </argLine>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/integration-test-standard/src/test/java/com/ericsson/bss/cassandra/ecaudit/integration/standard/ITVerifyAudit.java b/integration-test-standard/src/test/java/com/ericsson/bss/cassandra/ecaudit/integration/standard/ITVerifyAudit.java
index 1e36cd11..5f3d2079 100644
--- a/integration-test-standard/src/test/java/com/ericsson/bss/cassandra/ecaudit/integration/standard/ITVerifyAudit.java
+++ b/integration-test-standard/src/test/java/com/ericsson/bss/cassandra/ecaudit/integration/standard/ITVerifyAudit.java
@@ -410,7 +410,7 @@ public void testValidPreparedStatementTypesAreLogged() throws Exception
         String expectedStatement = "INSERT INTO ecks_itva.ectypetbl "
                 + "(partk, v0, v1, v2, v4, v5, v9, v13, v15)"
                 + " VALUES "
-                + "(?, ?, ?, ?, ?, ?, ?, ?, ?)[1, 'text', 'ascii', 123123123123123123, true, 1976-02-25, 8.8.8.8, 2004-05-29T14:29:00.000Z, 'varchar']";
+                + "(?, ?, ?, ?, ?, ?, ?, ?, ?)[1, 'text', 'ascii', 123123123123123123, true, '1976-02-25', '8.8.8.8', '2004-05-29T14:29:00.000Z', 'varchar']";
         // TODO: Are these bugs in Cassandra?
         // Was expecting "v5 date" to get quotes
         // Was expecting "v9 inet" to get quotes
diff --git a/integration-test-standard/src/test/java/com/ericsson/bss/cassandra/ecaudit/integration/standard/ITVerifyWhitelistManagement.java b/integration-test-standard/src/test/java/com/ericsson/bss/cassandra/ecaudit/integration/standard/ITVerifyWhitelistManagement.java
index 4c5ce4a6..6a6aaee5 100644
--- a/integration-test-standard/src/test/java/com/ericsson/bss/cassandra/ecaudit/integration/standard/ITVerifyWhitelistManagement.java
+++ b/integration-test-standard/src/test/java/com/ericsson/bss/cassandra/ecaudit/integration/standard/ITVerifyWhitelistManagement.java
@@ -188,7 +188,7 @@ public void testAuthorizedUserCanGrantWhitelistToHimself()
     {
         authorizedSession.execute("ALTER ROLE authorized_user WITH OPTIONS = { 'grant_audit_whitelist_for_all' : 'data' }");
 
-        assertRoleOperations("authorized_user", "data", asList("CREATE", "ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE"));
+        assertRoleOperations("authorized_user", "data", asList("CREATE", "ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE", "UNMASK", "SELECT_MASKED"));
     }
 
     @Test
@@ -196,7 +196,7 @@ public void testAuthorizedUserCanGrantWhitelistToOther()
     {
         authorizedSession.execute("ALTER ROLE other_user WITH OPTIONS = { 'grant_audit_whitelist_for_all' : 'data' }");
 
-        assertRoleOperations("other_user", "data", asList("CREATE", "ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE"));
+        assertRoleOperations("other_user", "data", asList("CREATE", "ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE", "UNMASK", "SELECT_MASKED"));
     }
 
     @Test
@@ -204,7 +204,7 @@ public void testAuthorizedUserCanGrantPermissionDerivedWhitelistToHimself()
     {
         authorizedSession.execute("ALTER ROLE authorized_user WITH OPTIONS = { 'grant_audit_whitelist_for_all' : 'grants/data' }");
 
-        assertRoleOperations("authorized_user", "grants/data", asList("CREATE", "ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE"));
+        assertRoleOperations("authorized_user", "grants/data", asList("CREATE", "ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE", "UNMASK", "SELECT_MASKED"));
     }
 
     @Test
@@ -212,7 +212,7 @@ public void testAuthorizedUserCanGrantPermissionDerivedWhitelistToOthers()
     {
         authorizedSession.execute("ALTER ROLE other_user WITH OPTIONS = { 'grant_audit_whitelist_for_all' : 'grants/data' }");
 
-        assertRoleOperations("other_user", "grants/data", asList("CREATE", "ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE"));
+        assertRoleOperations("other_user", "grants/data", asList("CREATE", "ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE", "UNMASK", "SELECT_MASKED"));
     }
 
     @Test(expected = UnauthorizedException.class)
@@ -246,7 +246,7 @@ public void testSuperUserCanWhitelistOnDataPartly()
         given_temporary_user(superSession);
         superSession.execute("ALTER ROLE temporary_user WITH OPTIONS = { 'grant_audit_whitelist_for_all' : 'data/ecks_itvwm/ectbl' }");
 
-        assertRoleOperations("temporary_user", "data/ecks_itvwm/ectbl", asList("ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE"));
+        assertRoleOperations("temporary_user", "data/ecks_itvwm/ectbl", asList("ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE", "UNMASK", "SELECT_MASKED"));
     }
 
     @Test
@@ -255,7 +255,7 @@ public void testSuperUserCanWhitelistOnNonexistingKeyspace()
         given_temporary_user(superSession);
         superSession.execute("ALTER ROLE temporary_user WITH OPTIONS = { 'grant_audit_whitelist_for_all' : 'data/unknownks' }");
 
-        assertRoleOperations("temporary_user", "data/unknownks", asList("CREATE", "ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE"));
+        assertRoleOperations("temporary_user", "data/unknownks", asList("CREATE", "ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE", "UNMASK", "SELECT_MASKED"));
     }
 
     @Test (expected = InvalidQueryException.class)
@@ -271,7 +271,7 @@ public void testSuperUserCanWhitelistOnNonexistingTable()
         given_temporary_user(superSession);
         superSession.execute("ALTER ROLE temporary_user WITH OPTIONS = { 'grant_audit_whitelist_for_all' : 'data/ecks_itvwm/unknowntbl' }");
 
-        assertRoleOperations("temporary_user", "data/ecks_itvwm/unknowntbl", asList("ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE"));
+        assertRoleOperations("temporary_user", "data/ecks_itvwm/unknowntbl", asList("ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE", "UNMASK", "SELECT_MASKED"));
     }
 
     @Test (expected = InvalidQueryException.class)
@@ -319,7 +319,7 @@ public void testSuperUserCanWhitelistOnTableDataGrant()
     {
         given_temporary_user(superSession);
         superSession.execute("ALTER ROLE temporary_user WITH OPTIONS = { 'grant_audit_whitelist_for_all' : 'grants/data/ks/tb' }");
-        assertRoleOperations("temporary_user", "grants/data/ks/tb", asList("ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE"));
+        assertRoleOperations("temporary_user", "grants/data/ks/tb", asList("ALTER", "DROP", "SELECT", "MODIFY", "AUTHORIZE", "UNMASK", "SELECT_MASKED"));
     }
 
     @Test (expected = InvalidQueryException.class)
@@ -370,7 +370,7 @@ public void testRevokeOperations()
         superSession.execute("ALTER ROLE temporary_user WITH OPTIONS = { 'revoke_audit_whitelist_for_modify' : 'data' }");
         superSession.execute("ALTER ROLE temporary_user WITH OPTIONS = { 'revoke_audit_whitelist_for_drop' : 'data' }");
 
-        assertRoleOperations("temporary_user", "data", asList("CREATE", "ALTER", "SELECT", "AUTHORIZE"));
+        assertRoleOperations("temporary_user", "data", asList("CREATE", "ALTER", "SELECT", "AUTHORIZE", "UNMASK", "SELECT_MASKED"));
     }
 
     private void given_temporary_user(CqlSession privateSession)
diff --git a/pom.xml b/pom.xml
index 92e7de8c..d5bfd7dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
-    <artifactId>parent_c4.1</artifactId>
+    <artifactId>parent_c5.0</artifactId>
     <version>3.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
@@ -48,11 +48,11 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
-        <cassandra.version>4.1.2</cassandra.version>
-        <artifact.flavor.version>c4.1</artifact.flavor.version>
+        <cassandra.version>5.0-alpha1</cassandra.version>
+        <artifact.flavor.version>c5.0</artifact.flavor.version>
 
         <pmd-config-url>pmd-rules.xml</pmd-config-url>
 
@@ -83,7 +83,7 @@
         <org.apache.maven.plugins.maven-source-plugin.version>3.2.1</org.apache.maven.plugins.maven-source-plugin.version>
         <org.apache.maven.plugins.maven-javadoc-plugin.version>3.2.0</org.apache.maven.plugins.maven-javadoc-plugin.version>
         <org.apache.maven.plugins.maven-gpg-plugin.version>1.6</org.apache.maven.plugins.maven-gpg-plugin.version>
-        <org.jacoco.jacoco-maven-plugin.version>0.8.6</org.jacoco.jacoco-maven-plugin.version>
+        <org.jacoco.jacoco-maven-plugin.version>0.8.10</org.jacoco.jacoco-maven-plugin.version>
         <org.pitest.pitest-maven.version>1.6.2</org.pitest.pitest-maven.version>
         <org.apache.maven.plugins-maven-pmd-plugin.version>3.15.0</org.apache.maven.plugins-maven-pmd-plugin.version>
     </properties>
@@ -185,8 +185,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${org.apache.maven.plugins.maven-compiler-plugin.version}</version>
                     <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
+                        <source>11</source>
+                        <target>11</target>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -202,6 +202,36 @@
                         <execution />
                     </executions>
                     <configuration>
+                        <argLine>
+                            ${argLine}
+                            -Djdk.attach.allowAttachSelf=true
+                            --add-exports java.base/java.lang.ref=ALL-UNNAMED
+                            --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
+                            --add-exports java.base/jdk.internal.ref=ALL-UNNAMED
+                            --add-exports java.base/sun.nio.ch=ALL-UNNAMED
+                            --add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED
+                            --add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED
+                            --add-exports java.rmi/sun.rmi.server=ALL-UNNAMED
+                            --add-exports java.sql/java.sql=ALL-UNNAMED
+                            --add-exports jdk.attach/sun.tools.attach=ALL-UNNAMED
+                            --add-exports jdk.unsupported/sun.misc=ALL-UNNAMED
+                            --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+                            --add-opens java.base/java.lang=ALL-UNNAMED
+                            --add-opens java.base/java.lang.module=ALL-UNNAMED
+                            --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                            --add-opens java.base/java.io=ALL-UNNAMED
+                            --add-opens java.base/java.nio=ALL-UNNAMED
+                            --add-opens java.base/java.util=ALL-UNNAMED
+                            --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
+                            --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
+                            --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED
+                            --add-opens java.base/jdk.internal.math=ALL-UNNAMED
+                            --add-opens java.base/jdk.internal.module=ALL-UNNAMED
+                            --add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED
+                            --add-opens java.base/sun.nio.ch=ALL-UNNAMED
+                            --add-opens jdk.compiler/com.sun.tools.javac=ALL-UNNAMED
+                            --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
+                        </argLine>
                         <excludes>
                             <exclude>com.ericsson.bss.cassandra.ecaudit.integration.*</exclude>
                         </excludes>
diff --git a/test-utils/pom.xml b/test-utils/pom.xml
index 8f554edf..ae679635 100644
--- a/test-utils/pom.xml
+++ b/test-utils/pom.xml
@@ -19,10 +19,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ericsson.bss.cassandra.ecaudit</groupId>
-        <artifactId>parent_c4.1</artifactId>
+        <artifactId>parent_c5.0</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>test-utils_c4.1</artifactId>
+    <artifactId>test-utils_c5.0</artifactId>
     <packaging>jar</packaging>
 
     <name>Ericsson Cassandra Audit - Test Utils</name>
diff --git a/test-utils/src/main/java/com/ericsson/bss/cassandra/ecaudit/test/mode/ClientInitializer.java b/test-utils/src/main/java/com/ericsson/bss/cassandra/ecaudit/test/mode/ClientInitializer.java
index 5f25be29..dbd5d1cb 100644
--- a/test-utils/src/main/java/com/ericsson/bss/cassandra/ecaudit/test/mode/ClientInitializer.java
+++ b/test-utils/src/main/java/com/ericsson/bss/cassandra/ecaudit/test/mode/ClientInitializer.java
@@ -21,6 +21,7 @@
 import org.apache.cassandra.auth.IAuthorizer;
 import org.apache.cassandra.auth.INetworkAuthorizer;
 import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.dht.RandomPartitioner;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -42,10 +43,12 @@ public static void beforeClass()
         DatabaseDescriptor.setAuthorizer(authorizerMock);
         when(networkAuthorizerMock.bulkLoader()).thenReturn(Collections::emptyMap);
         DatabaseDescriptor.setNetworkAuthorizer(networkAuthorizerMock);
+        DatabaseDescriptor.setPartitionerUnsafe(RandomPartitioner.instance);
     }
 
     public static void afterClass()
     {
+        DatabaseDescriptor.setPartitionerUnsafe(null);
         DatabaseDescriptor.setNetworkAuthorizer(null);
         DatabaseDescriptor.setAuthorizer(null);
         DatabaseDescriptor.setAuthenticator(null);