diff --git a/CHANGELOG.md b/CHANGELOG.md
index b681d90e37..8341c02e18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 Changes that happened in releases
 
-## 1.6.14-SNAPSHOT
+## 2.0.0-SNAPSHOT
 
 ### New features
 
diff --git a/archetype/core-sample/pom.xml b/archetype/core-sample/pom.xml
index ff0d367507..affb9c2720 100644
--- a/archetype/core-sample/pom.xml
+++ b/archetype/core-sample/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-archetype</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/archetype/deltaspike-data-sample/pom.xml b/archetype/deltaspike-data-sample/pom.xml
index a8131e0d33..208103a18e 100644
--- a/archetype/deltaspike-data-sample/pom.xml
+++ b/archetype/deltaspike-data-sample/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-archetype</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/archetype/entity-view-sample/pom.xml b/archetype/entity-view-sample/pom.xml
index bda94bc35f..209a92e5c9 100644
--- a/archetype/entity-view-sample/pom.xml
+++ b/archetype/entity-view-sample/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-archetype</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/archetype/jakarta-ee-sample/pom.xml b/archetype/jakarta-ee-sample/pom.xml
index 684ed71466..af55d9408e 100644
--- a/archetype/jakarta-ee-sample/pom.xml
+++ b/archetype/jakarta-ee-sample/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-archetype</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 06968e40ec..4dc97ddee8 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/archetype/spring-boot-sample/pom.xml b/archetype/spring-boot-sample/pom.xml
index 54c6f2d011..2207f1b7cd 100644
--- a/archetype/spring-boot-sample/pom.xml
+++ b/archetype/spring-boot-sample/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-archetype</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/archetype/spring-data-sample/pom.xml b/archetype/spring-data-sample/pom.xml
index 50f894d823..d1ed5ad0ee 100644
--- a/archetype/spring-data-sample/pom.xml
+++ b/archetype/spring-data-sample/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-archetype</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/checkstyle-rules/pom.xml b/checkstyle-rules/pom.xml
index 2502fa65ed..02a3766f75 100644
--- a/checkstyle-rules/pom.xml
+++ b/checkstyle-rules/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/core/api/pom.xml b/core/api/pom.xml
index dc6e3254c6..55b0e20caf 100644
--- a/core/api/pom.xml
+++ b/core/api/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/core/impl/pom.xml b/core/impl/pom.xml
index 437f76b1d8..8df35c330e 100644
--- a/core/impl/pom.xml
+++ b/core/impl/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/core/parser/pom.xml b/core/parser/pom.xml
index 9cd8f343f6..5e9c03c1bd 100644
--- a/core/parser/pom.xml
+++ b/core/parser/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/core/pom.xml b/core/pom.xml
index 37b22715c8..e42c848b73 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/core/testsuite-hibernate/pom.xml b/core/testsuite-hibernate/pom.xml
index 7c2a84535f..7e65699317 100644
--- a/core/testsuite-hibernate/pom.xml
+++ b/core/testsuite-hibernate/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/core/testsuite/pom.xml b/core/testsuite/pom.xml
index 6abc502dc3..e9acff334a 100644
--- a/core/testsuite/pom.xml
+++ b/core/testsuite/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-core</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/dist/bom/pom.xml b/dist/bom/pom.xml
index a18c3346f4..e045cb97dc 100644
--- a/dist/bom/pom.xml
+++ b/dist/bom/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dist/pom.xml b/dist/pom.xml
index 3845190fb5..d442f51f70 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/documentation/pom.xml b/documentation/pom.xml
index 583d89a0ba..f6422effba 100644
--- a/documentation/pom.xml
+++ b/documentation/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/entity-view/api/pom.xml b/entity-view/api/pom.xml
index 1b84e574d7..a3fbb4af59 100644
--- a/entity-view/api/pom.xml
+++ b/entity-view/api/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/entity-view/impl/pom.xml b/entity-view/impl/pom.xml
index 42a6cb9644..53f94fdbc9 100644
--- a/entity-view/impl/pom.xml
+++ b/entity-view/impl/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/entity-view/pom.xml b/entity-view/pom.xml
index 2c31fd35a6..45f9bb4405 100644
--- a/entity-view/pom.xml
+++ b/entity-view/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/entity-view/processor/pom.xml b/entity-view/processor/pom.xml
index 6f697131dc..ada184fd76 100644
--- a/entity-view/processor/pom.xml
+++ b/entity-view/processor/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/entity-view/testsuite/pom.xml b/entity-view/testsuite/pom.xml
index 3ef0a18888..4e8ea80b2b 100644
--- a/entity-view/testsuite/pom.xml
+++ b/entity-view/testsuite/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-entity-view</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/deltaspike-data-rest/pom.xml b/examples/deltaspike-data-rest/pom.xml
index d9527b2ff2..7364856be1 100644
--- a/examples/deltaspike-data-rest/pom.xml
+++ b/examples/deltaspike-data-rest/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
diff --git a/examples/it-service-management/pom.xml b/examples/it-service-management/pom.xml
index 4446ec114b..4991f10ccf 100644
--- a/examples/it-service-management/pom.xml
+++ b/examples/it-service-management/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
diff --git a/examples/microprofile-graphql/pom.xml b/examples/microprofile-graphql/pom.xml
index f85630f8de..f49f1ce9b6 100644
--- a/examples/microprofile-graphql/pom.xml
+++ b/examples/microprofile-graphql/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
diff --git a/examples/pom.xml b/examples/pom.xml
index 6855fa967b..a50c624660 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/quarkus-3/base/pom.xml b/examples/quarkus-3/base/pom.xml
index 128edb63b8..605490ce77 100644
--- a/examples/quarkus-3/base/pom.xml
+++ b/examples/quarkus-3/base/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/quarkus-3/pom.xml b/examples/quarkus-3/pom.xml
index e6a6358a06..f672f58eaa 100644
--- a/examples/quarkus-3/pom.xml
+++ b/examples/quarkus-3/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/quarkus-3/testsuite/base/pom.xml b/examples/quarkus-3/testsuite/base/pom.xml
index fdd54a997e..9b736457d0 100644
--- a/examples/quarkus-3/testsuite/base/pom.xml
+++ b/examples/quarkus-3/testsuite/base/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3-testsuite</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/quarkus-3/testsuite/native/db2/pom.xml b/examples/quarkus-3/testsuite/native/db2/pom.xml
index 3c21a9ef02..8e9d3d9edb 100644
--- a/examples/quarkus-3/testsuite/native/db2/pom.xml
+++ b/examples/quarkus-3/testsuite/native/db2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3-testsuite-native</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/quarkus-3/testsuite/native/h2/pom.xml b/examples/quarkus-3/testsuite/native/h2/pom.xml
index 5143eb7155..10b543eb2d 100644
--- a/examples/quarkus-3/testsuite/native/h2/pom.xml
+++ b/examples/quarkus-3/testsuite/native/h2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3-testsuite-native</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/quarkus-3/testsuite/native/mssql/pom.xml b/examples/quarkus-3/testsuite/native/mssql/pom.xml
index 28be4414ca..f04e1f6c64 100644
--- a/examples/quarkus-3/testsuite/native/mssql/pom.xml
+++ b/examples/quarkus-3/testsuite/native/mssql/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3-testsuite-native</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/quarkus-3/testsuite/native/mysql/pom.xml b/examples/quarkus-3/testsuite/native/mysql/pom.xml
index a7c5bed267..ceb3ed85a0 100644
--- a/examples/quarkus-3/testsuite/native/mysql/pom.xml
+++ b/examples/quarkus-3/testsuite/native/mysql/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3-testsuite-native</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/quarkus-3/testsuite/native/pom.xml b/examples/quarkus-3/testsuite/native/pom.xml
index bcd5694ce7..9c932ac41d 100644
--- a/examples/quarkus-3/testsuite/native/pom.xml
+++ b/examples/quarkus-3/testsuite/native/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3-testsuite</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/quarkus-3/testsuite/native/postgresql/pom.xml b/examples/quarkus-3/testsuite/native/postgresql/pom.xml
index 2fd03823c8..4fc425f1e2 100644
--- a/examples/quarkus-3/testsuite/native/postgresql/pom.xml
+++ b/examples/quarkus-3/testsuite/native/postgresql/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3-testsuite-native</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/quarkus-3/testsuite/pom.xml b/examples/quarkus-3/testsuite/pom.xml
index b3bf751a8c..4f43a581af 100644
--- a/examples/quarkus-3/testsuite/pom.xml
+++ b/examples/quarkus-3/testsuite/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-quarkus-3</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/showcase/base/pom.xml b/examples/showcase/base/pom.xml
index 36e234ba92..98226ddab7 100644
--- a/examples/showcase/base/pom.xml
+++ b/examples/showcase/base/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-showcase</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/showcase/fragments/basic/pom.xml b/examples/showcase/fragments/basic/pom.xml
index fcd2f92dbb..6a0f2aacfa 100644
--- a/examples/showcase/fragments/basic/pom.xml
+++ b/examples/showcase/fragments/basic/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-showcase-fragments</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/showcase/fragments/cte/pom.xml b/examples/showcase/fragments/cte/pom.xml
index ca9442279f..c40fcb3a5f 100644
--- a/examples/showcase/fragments/cte/pom.xml
+++ b/examples/showcase/fragments/cte/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-showcase-fragments</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/showcase/fragments/pom.xml b/examples/showcase/fragments/pom.xml
index 14c1d5f375..2e91ab83a6 100644
--- a/examples/showcase/fragments/pom.xml
+++ b/examples/showcase/fragments/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples-showcase</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/showcase/fragments/spring-data/pom.xml b/examples/showcase/fragments/spring-data/pom.xml
index bf6d5c795c..99efa39b56 100644
--- a/examples/showcase/fragments/spring-data/pom.xml
+++ b/examples/showcase/fragments/spring-data/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-showcase-fragments</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/showcase/pom.xml b/examples/showcase/pom.xml
index f60dc97241..635f6f0714 100644
--- a/examples/showcase/pom.xml
+++ b/examples/showcase/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/showcase/runner/cdi/pom.xml b/examples/showcase/runner/cdi/pom.xml
index 641b326b7c..98b619927e 100644
--- a/examples/showcase/runner/cdi/pom.xml
+++ b/examples/showcase/runner/cdi/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-showcase-runner</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/showcase/runner/pom.xml b/examples/showcase/runner/pom.xml
index bacc843797..5ac4400537 100644
--- a/examples/showcase/runner/pom.xml
+++ b/examples/showcase/runner/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples-showcase</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/showcase/runner/spring/pom.xml b/examples/showcase/runner/spring/pom.xml
index b7dc102c5c..31ec5586e6 100644
--- a/examples/showcase/runner/spring/pom.xml
+++ b/examples/showcase/runner/spring/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-showcase-runner</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/showcase/spi/pom.xml b/examples/showcase/spi/pom.xml
index 9e44c546ae..980eb9e0c0 100644
--- a/examples/showcase/spi/pom.xml
+++ b/examples/showcase/spi/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-examples-showcase</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/examples/spring-data-dgs/pom.xml b/examples/spring-data-dgs/pom.xml
index f05ea555d7..1c3bf12fc0 100644
--- a/examples/spring-data-dgs/pom.xml
+++ b/examples/spring-data-dgs/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
diff --git a/examples/spring-data-graphql/pom.xml b/examples/spring-data-graphql/pom.xml
index 70d4489aca..3e3f1febed 100644
--- a/examples/spring-data-graphql/pom.xml
+++ b/examples/spring-data-graphql/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
diff --git a/examples/spring-data-spqr/pom.xml b/examples/spring-data-spqr/pom.xml
index 3256f0a54b..97bef680ba 100644
--- a/examples/spring-data-spqr/pom.xml
+++ b/examples/spring-data-spqr/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
diff --git a/examples/spring-data-webflux/pom.xml b/examples/spring-data-webflux/pom.xml
index 56a302ae6f..efa3c0e26e 100644
--- a/examples/spring-data-webflux/pom.xml
+++ b/examples/spring-data-webflux/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
diff --git a/examples/spring-data-webmvc/pom.xml b/examples/spring-data-webmvc/pom.xml
index 5be0cb3972..17be99685c 100644
--- a/examples/spring-data-webmvc/pom.xml
+++ b/examples/spring-data-webmvc/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
diff --git a/examples/spring-hateoas/pom.xml b/examples/spring-hateoas/pom.xml
index 12b53512fc..d061c357ec 100644
--- a/examples/spring-hateoas/pom.xml
+++ b/examples/spring-hateoas/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-examples</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
diff --git a/integration/deltaspike-data/api/pom.xml b/integration/deltaspike-data/api/pom.xml
index ba1e13030b..3e9dcfc9df 100644
--- a/integration/deltaspike-data/api/pom.xml
+++ b/integration/deltaspike-data/api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-deltaspike-data</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/deltaspike-data/base/pom.xml b/integration/deltaspike-data/base/pom.xml
index 45f00c7b71..f99857255d 100644
--- a/integration/deltaspike-data/base/pom.xml
+++ b/integration/deltaspike-data/base/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-deltaspike-data</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/deltaspike-data/impl-2.0/pom.xml b/integration/deltaspike-data/impl-2.0/pom.xml
index 5fbec89739..04084a86f9 100644
--- a/integration/deltaspike-data/impl-2.0/pom.xml
+++ b/integration/deltaspike-data/impl-2.0/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-deltaspike-data</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.13-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/deltaspike-data/pom.xml b/integration/deltaspike-data/pom.xml
index 6861225c62..bd1bbb5f7d 100644
--- a/integration/deltaspike-data/pom.xml
+++ b/integration/deltaspike-data/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/deltaspike-data/rest/api/pom.xml b/integration/deltaspike-data/rest/api/pom.xml
index ea7301d0ba..ffeaf720e2 100644
--- a/integration/deltaspike-data/rest/api/pom.xml
+++ b/integration/deltaspike-data/rest/api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-deltaspike-data-rest</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/deltaspike-data/rest/impl/pom.xml b/integration/deltaspike-data/rest/impl/pom.xml
index e25d8f6e8c..72a15b1f72 100644
--- a/integration/deltaspike-data/rest/impl/pom.xml
+++ b/integration/deltaspike-data/rest/impl/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-deltaspike-data-rest</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/deltaspike-data/rest/pom.xml b/integration/deltaspike-data/rest/pom.xml
index 2622a8000a..34a9222a8b 100644
--- a/integration/deltaspike-data/rest/pom.xml
+++ b/integration/deltaspike-data/rest/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-deltaspike-data</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/deltaspike-data/testsuite/pom.xml b/integration/deltaspike-data/testsuite/pom.xml
index d3e0404eee..72a96a2676 100644
--- a/integration/deltaspike-data/testsuite/pom.xml
+++ b/integration/deltaspike-data/testsuite/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-deltaspike-data</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/eclipselink/pom.xml b/integration/eclipselink/pom.xml
index 2c0eb9b1a2..1a0c0ebdf4 100644
--- a/integration/eclipselink/pom.xml
+++ b/integration/eclipselink/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration/entity-view-cdi/pom.xml b/integration/entity-view-cdi/pom.xml
index 1bd5dab8db..4857aa0c66 100644
--- a/integration/entity-view-cdi/pom.xml
+++ b/integration/entity-view-cdi/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>blaze-persistence-integration-entity-view-cdi</artifactId>
     <packaging>jar</packaging>
diff --git a/integration/entity-view-spring-6.0/pom.xml b/integration/entity-view-spring-6.0/pom.xml
index 73d26c74a2..2ff7d1646c 100644
--- a/integration/entity-view-spring-6.0/pom.xml
+++ b/integration/entity-view-spring-6.0/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/integration/graphql-dgs-7.0/pom.xml b/integration/graphql-dgs-7.0/pom.xml
index 9f6519d926..7d12143926 100644
--- a/integration/graphql-dgs-7.0/pom.xml
+++ b/integration/graphql-dgs-7.0/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/graphql-spqr/pom.xml b/integration/graphql-spqr/pom.xml
index 5ea97cce05..c8b8a7c1f8 100644
--- a/integration/graphql-spqr/pom.xml
+++ b/integration/graphql-spqr/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/graphql/pom.xml b/integration/graphql/pom.xml
index cc56e020ee..8b89779698 100644
--- a/integration/graphql/pom.xml
+++ b/integration/graphql/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/hibernate-6.2/pom.xml b/integration/hibernate-6.2/pom.xml
index 6286c2b36a..d4e42e1931 100644
--- a/integration/hibernate-6.2/pom.xml
+++ b/integration/hibernate-6.2/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration/hibernate6-base/pom.xml b/integration/hibernate6-base/pom.xml
index a49b33f466..9e305560bf 100644
--- a/integration/hibernate6-base/pom.xml
+++ b/integration/hibernate6-base/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration/jackson/pom.xml b/integration/jackson/pom.xml
index 5c3fe311c3..1046ad3160 100644
--- a/integration/jackson/pom.xml
+++ b/integration/jackson/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/jaxrs-jackson/pom.xml b/integration/jaxrs-jackson/pom.xml
index cd1346fe71..4a70cbe6fb 100644
--- a/integration/jaxrs-jackson/pom.xml
+++ b/integration/jaxrs-jackson/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/jaxrs-jsonb/pom.xml b/integration/jaxrs-jsonb/pom.xml
index 669828cfe9..0f22a33669 100644
--- a/integration/jaxrs-jsonb/pom.xml
+++ b/integration/jaxrs-jsonb/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/jaxrs/pom.xml b/integration/jaxrs/pom.xml
index 9922296af8..50482af83b 100644
--- a/integration/jaxrs/pom.xml
+++ b/integration/jaxrs/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/jpa-base/pom.xml b/integration/jpa-base/pom.xml
index e8cb243fb2..18f0e2c08b 100644
--- a/integration/jpa-base/pom.xml
+++ b/integration/jpa-base/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration/jsonb/pom.xml b/integration/jsonb/pom.xml
index 4551e36390..ae55cac233 100644
--- a/integration/jsonb/pom.xml
+++ b/integration/jsonb/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/pom.xml b/integration/pom.xml
index 905e7d6e34..56bb03d68e 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/integration/quarkus-3/deployment/pom.xml b/integration/quarkus-3/deployment/pom.xml
index 35193499b5..e30b7f249a 100644
--- a/integration/quarkus-3/deployment/pom.xml
+++ b/integration/quarkus-3/deployment/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-quarkus-3-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/quarkus-3/pom.xml b/integration/quarkus-3/pom.xml
index 08c29249ac..fbdd909079 100644
--- a/integration/quarkus-3/pom.xml
+++ b/integration/quarkus-3/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/quarkus-3/runtime/pom.xml b/integration/quarkus-3/runtime/pom.xml
index eff600bc80..ee997a56a3 100644
--- a/integration/quarkus-3/runtime/pom.xml
+++ b/integration/quarkus-3/runtime/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-quarkus-3-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/querydsl/expressions/pom.xml b/integration/querydsl/expressions/pom.xml
index 1605c78654..756e1c964b 100644
--- a/integration/querydsl/expressions/pom.xml
+++ b/integration/querydsl/expressions/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration-querydsl-parent</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/integration/querydsl/pom.xml b/integration/querydsl/pom.xml
index 2447b09416..b33b96c9b9 100644
--- a/integration/querydsl/pom.xml
+++ b/integration/querydsl/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>blaze-persistence-integration-querydsl-parent</artifactId>
diff --git a/integration/querydsl/testsuite/pom.xml b/integration/querydsl/testsuite/pom.xml
index 24e18f2fff..15340a6423 100644
--- a/integration/querydsl/testsuite/pom.xml
+++ b/integration/querydsl/testsuite/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration-querydsl-parent</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/spring-data/3.1/pom.xml b/integration/spring-data/3.1/pom.xml
index e239f0646d..7b7c4261b3 100644
--- a/integration/spring-data/3.1/pom.xml
+++ b/integration/spring-data/3.1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/spring-data/3.3/pom.xml b/integration/spring-data/3.3/pom.xml
index b454a793d8..e5beefbb2e 100644
--- a/integration/spring-data/3.3/pom.xml
+++ b/integration/spring-data/3.3/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/spring-data/base-3.1/pom.xml b/integration/spring-data/base-3.1/pom.xml
index 83c4d16b81..1cbcb8796f 100644
--- a/integration/spring-data/base-3.1/pom.xml
+++ b/integration/spring-data/base-3.1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/spring-data/base-3.3/pom.xml b/integration/spring-data/base-3.3/pom.xml
index 13aee209eb..272ed7038b 100644
--- a/integration/spring-data/base-3.3/pom.xml
+++ b/integration/spring-data/base-3.3/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/spring-data/pom.xml b/integration/spring-data/pom.xml
index 96aa90aa88..8e6beccb08 100644
--- a/integration/spring-data/pom.xml
+++ b/integration/spring-data/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration/spring-data/testsuite/pom.xml b/integration/spring-data/testsuite/pom.xml
index a8d1d06c2b..6315f42243 100644
--- a/integration/spring-data/testsuite/pom.xml
+++ b/integration/spring-data/testsuite/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/spring-data/testsuite/webflux/pom.xml b/integration/spring-data/testsuite/webflux/pom.xml
index a011735c69..b77b676b69 100644
--- a/integration/spring-data/testsuite/webflux/pom.xml
+++ b/integration/spring-data/testsuite/webflux/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-testsuite</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/spring-data/testsuite/webmvc/pom.xml b/integration/spring-data/testsuite/webmvc/pom.xml
index 8548f0ace1..6845761d88 100644
--- a/integration/spring-data/testsuite/webmvc/pom.xml
+++ b/integration/spring-data/testsuite/webmvc/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-testsuite</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/spring-data/webflux/pom.xml b/integration/spring-data/webflux/pom.xml
index c5ec47a995..bb6dcd6e3f 100644
--- a/integration/spring-data/webflux/pom.xml
+++ b/integration/spring-data/webflux/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/spring-data/webmvc/pom.xml b/integration/spring-data/webmvc/pom.xml
index 64acfc939c..e7074927f8 100644
--- a/integration/spring-data/webmvc/pom.xml
+++ b/integration/spring-data/webmvc/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-data-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/integration/spring-hateoas/pom.xml b/integration/spring-hateoas/pom.xml
index dc727e20d7..fc76f1186f 100644
--- a/integration/spring-hateoas/pom.xml
+++ b/integration/spring-hateoas/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration/spring-hateoas/webmvc/pom.xml b/integration/spring-hateoas/webmvc/pom.xml
index 9dd1abb597..1299257061 100644
--- a/integration/spring-hateoas/webmvc/pom.xml
+++ b/integration/spring-hateoas/webmvc/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blaze-persistence-integration-spring-hateoas-parent</artifactId>
         <groupId>com.blazebit</groupId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/jpa-criteria/api/pom.xml b/jpa-criteria/api/pom.xml
index 63be576de7..1e42099c7e 100644
--- a/jpa-criteria/api/pom.xml
+++ b/jpa-criteria/api/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-jpa-criteria</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jpa-criteria/impl/pom.xml b/jpa-criteria/impl/pom.xml
index 91777c2793..30a9519cd1 100644
--- a/jpa-criteria/impl/pom.xml
+++ b/jpa-criteria/impl/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-jpa-criteria</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jpa-criteria/pom.xml b/jpa-criteria/pom.xml
index fef7f865a4..249d2110f9 100644
--- a/jpa-criteria/pom.xml
+++ b/jpa-criteria/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/jpa-criteria/testsuite/pom.xml b/jpa-criteria/testsuite/pom.xml
index 8fced39f1a..02d0c05f6c 100644
--- a/jpa-criteria/testsuite/pom.xml
+++ b/jpa-criteria/testsuite/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-jpa-criteria</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index a2475973d2..61bc9f2ce2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 6c7a033019..a425d75046 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     </parent>
 
     <artifactId>blaze-persistence</artifactId>
-    <version>1.6.14-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Blazebit Blaze-Persistence</name>
diff --git a/testsuite-base/assertion/pom.xml b/testsuite-base/assertion/pom.xml
index 374c88e46b..2ef4627e02 100644
--- a/testsuite-base/assertion/pom.xml
+++ b/testsuite-base/assertion/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-testsuite-base</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite-base/eclipselink/pom.xml b/testsuite-base/eclipselink/pom.xml
index 69e4547596..b48a3dadd5 100644
--- a/testsuite-base/eclipselink/pom.xml
+++ b/testsuite-base/eclipselink/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-testsuite-base</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite-base/hibernate6/pom.xml b/testsuite-base/hibernate6/pom.xml
index 9c6188518f..f17a570a40 100644
--- a/testsuite-base/hibernate6/pom.xml
+++ b/testsuite-base/hibernate6/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-testsuite-base</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
diff --git a/testsuite-base/jpa/pom.xml b/testsuite-base/jpa/pom.xml
index b8d907eee9..a48210cba9 100644
--- a/testsuite-base/jpa/pom.xml
+++ b/testsuite-base/jpa/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-testsuite-base</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
diff --git a/testsuite-base/pom.xml b/testsuite-base/pom.xml
index f67ced6c1c..84e15708c4 100644
--- a/testsuite-base/pom.xml
+++ b/testsuite-base/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/website/pom.xml b/website/pom.xml
index b778bbcaf3..6dfd2930a3 100644
--- a/website/pom.xml
+++ b/website/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-parent</artifactId>
-        <version>1.6.14-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -24,7 +24,7 @@
         <stable.version>1.6.13</stable.version>
         <series.version>2.0</series.version>
         <!-- The current snapshot version -->
-        <snapshot.version>1.6.14-SNAPSHOT</snapshot.version>
+        <snapshot.version>2.0.0-SNAPSHOT</snapshot.version>
 
         <!-- This is used for the htaccess file for filename based caching -->
         <maven.build.timestamp.format>yyyyMMddHHmmssSSSS</maven.build.timestamp.format>