diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/dgs-federation-example.iml b/.idea/dgs-federation-example.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/dgs-federation-example.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..26854f7
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/dgs-federation-example.iml" filepath="$PROJECT_DIR$/.idea/dgs-federation-example.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/reviews-dgs/build.gradle.kts b/reviews-dgs/build.gradle.kts
index e6d19c4..c693b69 100644
--- a/reviews-dgs/build.gradle.kts
+++ b/reviews-dgs/build.gradle.kts
@@ -20,7 +20,7 @@ plugins {
 	id("io.spring.dependency-management") version "1.0.12.RELEASE"
 	kotlin("plugin.spring") version "1.6.21"
 	id("java")
-	id("com.netflix.dgs.codegen") version "5.5.0"
+	id("com.netflix.dgs.codegen") version "5.11.1"
 }
 
 group = "com.example"
@@ -40,7 +40,7 @@ dependencies {
 }
 
 tasks.withType<com.netflix.graphql.dgs.codegen.gradle.GenerateJavaTask> {
-	generateClient = true
+	generateClientv2 = true
 	packageName = "com.example.demo.generated"
 }
 
diff --git a/reviews-dgs/src/test/java/com/example/demo/datafetchers/ReviewsDatafetcherTest.java b/reviews-dgs/src/test/java/com/example/demo/datafetchers/ReviewsDatafetcherTest.java
index 3ba858f..51fb384 100644
--- a/reviews-dgs/src/test/java/com/example/demo/datafetchers/ReviewsDatafetcherTest.java
+++ b/reviews-dgs/src/test/java/com/example/demo/datafetchers/ReviewsDatafetcherTest.java
@@ -53,7 +53,7 @@ void shows() {
     @Test
     void showsWithEntitiesQueryBuilder() {
         EntitiesGraphQLQuery entitiesQuery = new EntitiesGraphQLQuery.Builder().addRepresentationAsVariable(ShowRepresentation.newBuilder().id("1").build()).build();
-        GraphQLQueryRequest request = new GraphQLQueryRequest(entitiesQuery, new EntitiesProjectionRoot().onShow().reviews().starRating());
+        GraphQLQueryRequest request = new GraphQLQueryRequest(entitiesQuery, new EntitiesProjectionRoot<>().onShow().reviews().starRating());
         List<Review> reviewsList = dgsQueryExecutor.executeAndExtractJsonPathAsObject(
                 request.serialize(),
                 "data['_entities'][0].reviews", entitiesQuery.getVariables(), new TypeRef<>() {
diff --git a/shows-dgs/build.gradle.kts b/shows-dgs/build.gradle.kts
index 9924814..70951fc 100644
--- a/shows-dgs/build.gradle.kts
+++ b/shows-dgs/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 	id("io.spring.dependency-management") version "1.0.12.RELEASE"
 	kotlin("jvm") version "1.7.10"
 	kotlin("plugin.spring") version "1.6.21"
-	id("com.netflix.dgs.codegen") version "5.5.0"
+	id("com.netflix.dgs.codegen") version "5.11.1"
 }
 
 group = "com.example"
@@ -42,7 +42,7 @@ dependencies {
 
 @OptIn(kotlin.ExperimentalStdlibApi::class)
 tasks.withType<com.netflix.graphql.dgs.codegen.gradle.GenerateJavaTask> {
-	generateClient = true
+	generateClientv2 = true
 	packageName = "com.example.demo.generated"
 }
 
diff --git a/shows-dgs/src/test/kotlin/com/example/demo/datafetchers/ShowsDataFetcherTest.kt b/shows-dgs/src/test/kotlin/com/example/demo/datafetchers/ShowsDataFetcherTest.kt
index 2bfd3de..9cca519 100644
--- a/shows-dgs/src/test/kotlin/com/example/demo/datafetchers/ShowsDataFetcherTest.kt
+++ b/shows-dgs/src/test/kotlin/com/example/demo/datafetchers/ShowsDataFetcherTest.kt
@@ -82,7 +82,7 @@ class ShowsDataFetcherTest {
             GraphQLQueryRequest(
                 ShowsGraphQLQuery.Builder()
                     .build(),
-                ShowsProjectionRoot().title())
+                ShowsProjectionRoot<>().title())
         val titles = dgsQueryExecutor.executeAndExtractJsonPath<List<String>>(graphQLQueryRequest.serialize(), "data.shows[*].title")
         assertThat(titles).contains("mock title")
     }