diff --git a/_includes/code/java-v6/pom.xml b/_includes/code/java-v6/pom.xml
index c136c109..7f8289d2 100644
--- a/_includes/code/java-v6/pom.xml
+++ b/_includes/code/java-v6/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>io.weaviate</groupId>
             <artifactId>client6</artifactId>
-            <version>6.0.0-RC1</version>
+            <version>6.0.0-RC2</version>
         </dependency>
         <!-- <dependency>
             <groupId>io.weaviate</groupId>
diff --git a/_includes/code/java-v6/src/test/java/ConfigurePQTest.java b/_includes/code/java-v6/src/test/java/ConfigurePQTest.java
index c77f05a6..507aa872 100644
--- a/_includes/code/java-v6/src/test/java/ConfigurePQTest.java
+++ b/_includes/code/java-v6/src/test/java/ConfigurePQTest.java
@@ -6,7 +6,7 @@
 import io.weaviate.client6.v1.api.collections.Property;
 import io.weaviate.client6.v1.api.collections.Quantization;
 import io.weaviate.client6.v1.api.collections.VectorConfig;
-import io.weaviate.client6.v1.api.collections.data.WriteWeaviateObject;
+import io.weaviate.client6.v1.api.collections.WeaviateObject;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -108,12 +108,12 @@ void testUpdateSchemaWithPQ() throws IOException {
     assertThat(initialConfig).isPresent();
 
     // START LoadData
-    List<WriteWeaviateObject<Map<String, Object>>> objectList =
+    List<WeaviateObject<Map<String, Object>>> objectList =
         data.stream().map(obj -> {
           Map<String, Object> properties = new HashMap<>();
           properties.put("question", obj.get("Question"));
           properties.put("answer", obj.get("Answer"));
-          return WriteWeaviateObject.<Map<String, Object>>of(
+          return WeaviateObject.<Map<String, Object>>of(
               builder -> builder.properties(properties));
         }).collect(Collectors.toList());
 
diff --git a/_includes/code/java-v6/src/test/java/ManageCollectionsCrossReferencesTest.java b/_includes/code/java-v6/src/test/java/ManageCollectionsCrossReferencesTest.java
index d8452e8c..813fa0ac 100644
--- a/_includes/code/java-v6/src/test/java/ManageCollectionsCrossReferencesTest.java
+++ b/_includes/code/java-v6/src/test/java/ManageCollectionsCrossReferencesTest.java
@@ -1,9 +1,9 @@
 import io.weaviate.client6.v1.api.WeaviateClient;
 import io.weaviate.client6.v1.api.collections.Property;
+import io.weaviate.client6.v1.api.collections.Reference;
 import io.weaviate.client6.v1.api.collections.ReferenceProperty;
-import io.weaviate.client6.v1.api.collections.data.Reference;
+import io.weaviate.client6.v1.api.collections.data.ObjectReference;
 import io.weaviate.client6.v1.api.collections.query.QueryReference;
-import io.weaviate.client6.v1.api.collections.query.ReadWeaviateObject;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -22,8 +22,8 @@ public class ManageCollectionsCrossReferencesTest {
   public static void beforeAll() {
     // Instantiate the client anonymously
     String openaiApiKey = System.getenv("OPENAI_API_KEY");
-    client = WeaviateClient.connectToLocal(config -> config
-        .setHeaders(Map.of("X-OpenAI-Api-Key", openaiApiKey)));
+    client = WeaviateClient.connectToLocal(
+        config -> config.setHeaders(Map.of("X-OpenAI-Api-Key", openaiApiKey)));
   }
 
   @AfterEach
@@ -44,19 +44,15 @@ public void afterEach() throws IOException {
   @Test
   void testCrossRefDefinition() throws IOException {
     // START CrossRefDefinition
-    client.collections.create("JeopardyCategory", col -> col
-        .description("A Jeopardy! category")
-        .properties(
-            Property.text("title")));
-
-    client.collections.create("JeopardyQuestion", col -> col
-        .description("A Jeopardy! question")
-        .properties(
-            Property.text("question"),
-            Property.text("answer"))
-        // highlight-start
-        .references(
-            ReferenceProperty.to("hasCategory", "JeopardyCategory"))
+    client.collections.create("JeopardyCategory",
+        col -> col.description("A Jeopardy! category")
+            .properties(Property.text("title")));
+
+    client.collections.create("JeopardyQuestion",
+        col -> col.description("A Jeopardy! question")
+            .properties(Property.text("question"), Property.text("answer"))
+            // highlight-start
+            .references(ReferenceProperty.to("hasCategory", "JeopardyCategory"))
     // highlight-end
     );
     // END CrossRefDefinition
@@ -64,7 +60,8 @@ void testCrossRefDefinition() throws IOException {
     // Verify collections were created properly
     var questionConfig = client.collections.getConfig("JeopardyQuestion").get();
     assertThat(questionConfig.references()).hasSize(1);
-    assertThat(questionConfig.references().get(0).propertyName()).isEqualTo("hasCategory");
+    assertThat(questionConfig.references().get(0).propertyName())
+        .isEqualTo("hasCategory");
   }
 
   @Test
@@ -78,28 +75,25 @@ void testObjectWithCrossRef() throws IOException {
     var categoryResult = categories.data.insert(categoryProperties);
     var categoryUuid = categoryResult.uuid();
 
-    Map<String, Object> properties = Map.of(
-        "question", "What tooling helps make Weaviate scalable?",
-        "answer", "Sharding, multi-tenancy, and replication");
+    Map<String, Object> properties =
+        Map.of("question", "What tooling helps make Weaviate scalable?",
+            "answer", "Sharding, multi-tenancy, and replication");
 
     // START ObjectWithCrossRef
     var questions = client.collections.use("JeopardyQuestion");
 
-    var result = questions.data.insert(
-        properties, // A map with the properties of the object
+    var result = questions.data.insert(properties, // A map with the properties of the object
         opt -> opt
             // highlight-start
-            .reference("hasCategory", Reference.uuids(categoryUuid)) // e.g. {"hasCategory":
-                                                                     // "583876f3-e293-5b5b-9839-03f455f14575"}
+            .reference("hasCategory", ObjectReference.uuids(categoryUuid)) // e.g. {"hasCategory":
+    // "583876f3-e293-5b5b-9839-03f455f14575"}
     // highlight-end
     );
     // END ObjectWithCrossRef
 
     // Test results
-    var fetchedObj = questions.query.fetchObjectById(
-        result.uuid(),
-        opt -> opt.returnReferences(
-            QueryReference.single("hasCategory")));
+    var fetchedObj = questions.query.fetchObjectById(result.uuid(),
+        opt -> opt.returnReferences(QueryReference.single("hasCategory")));
 
     assertThat(fetchedObj).isPresent();
     assertThat(fetchedObj.get().references()).containsKey("hasCategory");
@@ -113,9 +107,9 @@ void testOneWay() throws IOException {
     var categories = client.collections.use("JeopardyCategory");
 
     // Insert test data
-    Map<String, Object> questionData = Map.of(
-        "question", "This city is known for the Golden Gate Bridge",
-        "answer", "San Francisco");
+    Map<String, Object> questionData =
+        Map.of("question", "This city is known for the Golden Gate Bridge",
+            "answer", "San Francisco");
     var questionResult = questions.data.insert(questionData);
     var questionObjId = questionResult.uuid();
 
@@ -124,20 +118,16 @@ void testOneWay() throws IOException {
     var categoryObjId = categoryResult.uuid();
 
     // START OneWayCrossReferences
-    questions.data.referenceAdd(
-        questionObjId,
-        "hasCategory",
+    questions.data.referenceAdd(questionObjId, "hasCategory",
         // highlight-start
-        Reference.uuids(categoryObjId)
+        ObjectReference.uuids(categoryObjId)[0]
     // highlight-end
     );
     // END OneWayCrossReferences
 
     // Test results
-    var result = questions.query.fetchObjectById(
-        questionObjId,
-        opt -> opt.returnReferences(
-            QueryReference.single("hasCategory")));
+    var result = questions.query.fetchObjectById(questionObjId,
+        opt -> opt.returnReferences(QueryReference.single("hasCategory")));
 
     assertThat(result).isPresent();
     assertThat(result.get().references()).containsKey("hasCategory");
@@ -150,21 +140,17 @@ void testTwoWay() throws IOException {
     client.collections.delete("JeopardyCategory");
 
     // START TwoWayCategory1CrossReferences
-    client.collections.create("JeopardyCategory", col -> col
-        .description("A Jeopardy! category")
-        .properties(
-            Property.text("title")));
+    client.collections.create("JeopardyCategory",
+        col -> col.description("A Jeopardy! category")
+            .properties(Property.text("title")));
     // END TwoWayCategory1CrossReferences
 
     // START TwoWayQuestionCrossReferences
-    client.collections.create("JeopardyQuestion", col -> col
-        .description("A Jeopardy! question")
-        .properties(
-            Property.text("question"),
-            Property.text("answer"))
-        // highlight-start
-        .references(
-            ReferenceProperty.to("hasCategory", "JeopardyCategory"))
+    client.collections.create("JeopardyQuestion",
+        col -> col.description("A Jeopardy! question")
+            .properties(Property.text("question"), Property.text("answer"))
+            // highlight-start
+            .references(ReferenceProperty.to("hasCategory", "JeopardyCategory"))
     // highlight-end
     );
     // END TwoWayQuestionCrossReferences
@@ -182,9 +168,9 @@ void testTwoWay() throws IOException {
     var questions = client.collections.use("JeopardyQuestion");
     var categories = client.collections.use("JeopardyCategory");
 
-    Map<String, Object> questionData = Map.of(
-        "question", "This city is known for the Golden Gate Bridge",
-        "answer", "San Francisco");
+    Map<String, Object> questionData =
+        Map.of("question", "This city is known for the Golden Gate Bridge",
+            "answer", "San Francisco");
     var questionResult = questions.data.insert(questionData);
     var questionObjId = questionResult.uuid();
 
@@ -196,27 +182,21 @@ void testTwoWay() throws IOException {
     // For the "San Francisco" JeopardyQuestion object, add a cross-reference to the
     // "U.S. CITIES" JeopardyCategory object
     // highlight-start
-    questions.data.referenceAdd(
-        questionObjId,
-        "hasCategory",
-        Reference.uuids(categoryObjId));
+    questions.data.referenceAdd(questionObjId, "hasCategory",
+        ObjectReference.uuids(categoryObjId)[0]);
     // highlight-end
 
     // For the "U.S. CITIES" JeopardyCategory object, add a cross-reference to "San
     // Francisco"
     // highlight-start
-    categories.data.referenceAdd(
-        categoryObjId,
-        "hasQuestion",
-        Reference.uuids(questionObjId));
+    categories.data.referenceAdd(categoryObjId, "hasQuestion",
+        ObjectReference.uuids(questionObjId)[0]);
     // highlight-end
     // END TwoWayCrossReferences
 
     // Test results
-    var result = categories.query.fetchObjectById(
-        categoryObjId,
-        opt -> opt.returnReferences(
-            QueryReference.single("hasQuestion")));
+    var result = categories.query.fetchObjectById(categoryObjId,
+        opt -> opt.returnReferences(QueryReference.single("hasQuestion")));
 
     assertThat(result).isPresent();
     assertThat(result.get().references()).containsKey("hasQuestion");
@@ -230,9 +210,9 @@ void testMultiple() throws IOException {
     var categories = client.collections.use("JeopardyCategory");
 
     // Insert test data
-    Map<String, Object> questionData = Map.of(
-        "question", "This city is known for the Golden Gate Bridge",
-        "answer", "San Francisco");
+    Map<String, Object> questionData =
+        Map.of("question", "This city is known for the Golden Gate Bridge",
+            "answer", "San Francisco");
     var questionResult = questions.data.insert(questionData);
     var questionObjId = questionResult.uuid();
 
@@ -248,25 +228,20 @@ void testMultiple() throws IOException {
     // highlight-start
     // Add multiple references - need to add them individually
     for (String tempUuid : List.of(categoryObjId, categoryObjIdAlt)) {
-      questions.data.referenceAdd(
-          questionObjId,
-          "hasCategory",
-          Reference.uuids(tempUuid));
+      questions.data.referenceAdd(questionObjId, "hasCategory",
+          ObjectReference.uuids(tempUuid)[0]);
     }
     // highlight-end
     // END MultipleCrossReferences
 
     // Test results
-    var result = questions.query.fetchObjectById(
-        questionObjId,
-        opt -> opt.returnReferences(
-            QueryReference.single("hasCategory")));
+    var result = questions.query.fetchObjectById(questionObjId,
+        opt -> opt.returnReferences(QueryReference.single("hasCategory")));
 
     assertThat(result).isPresent();
     assertThat(result.get().references()).containsKey("hasCategory");
 
-    @SuppressWarnings("unchecked")
-    List<ReadWeaviateObject<Object>> refs = result.get().references().get("hasCategory");
+    var refs = result.get().references().get("hasCategory");
     assertThat(refs).hasSize(2);
   }
 
@@ -280,30 +255,26 @@ void testReadCrossRef() throws IOException {
     // Insert category and question with reference
     Map<String, Object> categoryData = Map.of("title", "SCIENCE");
     var categoryResult = categories.data.insert(categoryData);
-    Map<String, Object> questionData = Map.of("question", "What is H2O?", "answer", "Water");
-    var questionResult = questions.data.insert(
-        questionData,
-        opt -> opt.reference("hasCategory", Reference.objects(categoryResult)));
+    Map<String, Object> questionData =
+        Map.of("question", "What is H2O?", "answer", "Water");
+    var questionResult = questions.data.insert(questionData, opt -> opt
+        .reference("hasCategory", ObjectReference.objects(categoryResult)));
     var questionObjId = questionResult.uuid();
 
     // START ReadCrossRef
     // Include the cross-references in a query response
     // highlight-start
     var response = questions.query.fetchObjects( // Or `hybrid`, `nearText`, etc.
-        opt -> opt
-            .limit(2)
-            .returnReferences(
-                QueryReference.single("hasCategory",
-                    ref -> ref.returnProperties("title"))));
+        opt -> opt.limit(2)
+            .returnReferences(QueryReference.single("hasCategory",
+                ref -> ref.returnProperties("title"))));
     // highlight-end
 
     // Or include cross-references in a single-object retrieval
     // highlight-start
-    var obj = questions.query.fetchObjectById(
-        questionObjId,
-        opt -> opt.returnReferences(
-            QueryReference.single("hasCategory",
-                ref -> ref.returnProperties("title"))));
+    var obj = questions.query.fetchObjectById(questionObjId,
+        opt -> opt.returnReferences(QueryReference.single("hasCategory",
+            ref -> ref.returnProperties("title"))));
     // highlight-end
     // END ReadCrossRef
 
@@ -325,12 +296,11 @@ void testDelete() throws IOException {
     var categoryResult = categories.data.insert(categoryData);
     var categoryObjId = categoryResult.uuid();
 
-    Map<String, Object> questionData = Map.of(
-        "question", "This city is known for the Golden Gate Bridge",
-        "answer", "San Francisco");
-    var questionResult = questions.data.insert(
-        questionData,
-        opt -> opt.reference("hasCategory", Reference.uuids(categoryObjId)));
+    Map<String, Object> questionData =
+        Map.of("question", "This city is known for the Golden Gate Bridge",
+            "answer", "San Francisco");
+    var questionResult = questions.data.insert(questionData, opt -> opt
+        .reference("hasCategory", ObjectReference.uuids(categoryObjId)));
     var questionObjId = questionResult.uuid();
 
     // START DeleteCrossReference
@@ -339,19 +309,15 @@ void testDelete() throws IOException {
     // highlight-start
     questions.data.referenceDelete(
         // highlight-end
-        questionObjId,
-        "hasCategory",
-        Reference.uuids(categoryObjId));
+        questionObjId, "hasCategory", ObjectReference.uuids(categoryObjId)[0]);
     // END DeleteCrossReference
 
     // Test results
-    var result = questions.query.fetchObjectById(
-        questionObjId,
-        opt -> opt.returnReferences(
-            QueryReference.single("hasCategory")));
+    var result = questions.query.fetchObjectById(questionObjId,
+        opt -> opt.returnReferences(QueryReference.single("hasCategory")));
 
     assertThat(result).isPresent();
-    List<ReadWeaviateObject<Object>> refs = result.get().references().get("hasCategory");
+    List<Reference> refs = result.get().references().get("hasCategory");
     assertThat(refs).isEmpty();
   }
 
@@ -370,9 +336,9 @@ void testUpdate() throws IOException {
     Map<String, Object> categoryData2 = Map.of("title", "U.S. CITIES");
     categories.data.insert(categoryData2); // Secondary category for testing replacement
 
-    Map<String, Object> questionData = Map.of(
-        "question", "This city is known for the Golden Gate Bridge",
-        "answer", "San Francisco");
+    Map<String, Object> questionData =
+        Map.of("question", "This city is known for the Golden Gate Bridge",
+            "answer", "San Francisco");
     var questionResult = questions.data.insert(questionData);
     var questionObjId = questionResult.uuid();
 
@@ -382,40 +348,32 @@ void testUpdate() throws IOException {
     // highlight-start
     questions.data.referenceReplace(
         // highlight-end
-        questionObjId,
-        "hasCategory",
-        Reference.uuids(categoryObjId));
+        questionObjId, "hasCategory", ObjectReference.uuids(categoryObjId)[0]);
     // END UpdateCrossReference
 
     // Test results
-    var result = questions.query.fetchObjectById(
-        questionObjId,
-        opt -> opt.returnReferences(
-            QueryReference.single("hasCategory")));
+    var result = questions.query.fetchObjectById(questionObjId,
+        opt -> opt.returnReferences(QueryReference.single("hasCategory")));
 
     assertThat(result).isPresent();
-    List<ReadWeaviateObject<Object>> refs = result.get().references().get("hasCategory");
+    var refs = result.get().references().get("hasCategory");
     assertThat(refs).hasSize(1);
-    System.out.println("Reference UUID: " + refs.get(0));
-    // var refObj = (ObjectMetadata) refs.get(0);
-    // assertThat(refObj.uuid()).isEqualTo(categoryObjId);
+    System.out.println("Reference UUID: " + refs.get(0).uuid());
+    assertThat(refs.get(0).uuid()).isEqualTo(categoryObjId);
   }
 
   // Helper method to set up collections
   private void setupCollections() throws IOException {
     client.collections.delete("JeopardyCategory");
     client.collections.delete("JeopardyQuestion");
-    client.collections.create("JeopardyCategory", col -> col
-        .description("A Jeopardy! category")
-        .properties(
-            Property.text("title")));
-
-    client.collections.create("JeopardyQuestion", col -> col
-        .description("A Jeopardy! question")
-        .properties(
-            Property.text("question"),
-            Property.text("answer"))
-        .references(
-            ReferenceProperty.to("hasCategory", "JeopardyCategory")));
+    client.collections.create("JeopardyCategory",
+        col -> col.description("A Jeopardy! category")
+            .properties(Property.text("title")));
+
+    client.collections.create("JeopardyQuestion",
+        col -> col.description("A Jeopardy! question")
+            .properties(Property.text("question"), Property.text("answer"))
+            .references(
+                ReferenceProperty.to("hasCategory", "JeopardyCategory")));
   }
-}
\ No newline at end of file
+}
diff --git a/_includes/code/java-v6/src/test/java/ManageCollectionsMigrateDataTest.java b/_includes/code/java-v6/src/test/java/ManageCollectionsMigrateDataTest.java
index ed627ceb..46adca25 100644
--- a/_includes/code/java-v6/src/test/java/ManageCollectionsMigrateDataTest.java
+++ b/_includes/code/java-v6/src/test/java/ManageCollectionsMigrateDataTest.java
@@ -3,8 +3,7 @@
 import io.weaviate.client6.v1.api.collections.Generative;
 import io.weaviate.client6.v1.api.collections.Property;
 import io.weaviate.client6.v1.api.collections.VectorConfig;
-import io.weaviate.client6.v1.api.collections.data.WriteWeaviateObject;
-import io.weaviate.client6.v1.api.collections.query.ReadWeaviateObject;
+import io.weaviate.client6.v1.api.collections.WeaviateObject;
 import io.weaviate.client6.v1.api.collections.tenants.Tenant;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
@@ -103,11 +102,11 @@ private static CollectionHandle<Map<String, Object>> createCollection(
   private void migrateData(CollectionHandle<Map<String, Object>> collectionSrc,
       CollectionHandle<Map<String, Object>> collectionTgt) {
     System.out.println("Starting data migration...");
-    List<WriteWeaviateObject<Map<String, Object>>> sourceObjects = StreamSupport
+    List<WeaviateObject<Map<String, Object>>> sourceObjects = StreamSupport
         .stream(collectionSrc.paginate(p -> p.includeVector()).spliterator(),
             false)
-        .map(readObj -> WriteWeaviateObject.<Map<String, Object>>of(
-            builder -> builder.properties(readObj.properties())
+        .map(readObj -> WeaviateObject
+            .<Map<String, Object>>of(c -> c.properties(readObj.properties())
                 .uuid(readObj.uuid())
                 .vectors(readObj.vectors())))
         .collect(Collectors.toList());
@@ -122,7 +121,8 @@ private void migrateData(CollectionHandle<Map<String, Object>> collectionSrc,
   private boolean verifyMigration(
       CollectionHandle<Map<String, Object>> collectionSrc,
       CollectionHandle<Map<String, Object>> collectionTgt, int numSamples) {
-    List<ReadWeaviateObject<Map<String, Object>>> srcObjects =
+
+    List<WeaviateObject<Map<String, Object>>> srcObjects =
         StreamSupport.stream(collectionSrc.paginate().spliterator(), false)
             .collect(Collectors.toList());
 
@@ -131,13 +131,13 @@ private boolean verifyMigration(
       return false;
     }
     Collections.shuffle(srcObjects);
-    List<ReadWeaviateObject<Map<String, Object>>> sampledObjects =
+    List<WeaviateObject<Map<String, Object>>> sampledObjects =
         srcObjects.subList(0, Math.min(numSamples, srcObjects.size()));
 
     System.out.printf("Verifying %d random objects...\n",
         sampledObjects.size());
     for (var srcObj : sampledObjects) {
-      Optional<ReadWeaviateObject<Map<String, Object>>> tgtObjOpt = // Changed from WriteWeaviateObject
+      Optional<WeaviateObject<Map<String, Object>>> tgtObjOpt =
           collectionTgt.query.fetchObjectById(srcObj.uuid());
       if (tgtObjOpt.isEmpty()) {
         System.out.printf("Object %s not found in target collection\n",
diff --git a/_includes/code/java-v6/src/test/java/ManageCollectionsMultiTenancyTest.java b/_includes/code/java-v6/src/test/java/ManageCollectionsMultiTenancyTest.java
index 8c74535d..6b957146 100644
--- a/_includes/code/java-v6/src/test/java/ManageCollectionsMultiTenancyTest.java
+++ b/_includes/code/java-v6/src/test/java/ManageCollectionsMultiTenancyTest.java
@@ -1,6 +1,6 @@
 import io.weaviate.client6.v1.api.WeaviateClient;
 import io.weaviate.client6.v1.api.collections.CollectionHandle;
-import io.weaviate.client6.v1.api.collections.data.Reference;
+import io.weaviate.client6.v1.api.collections.data.ObjectReference;
 import io.weaviate.client6.v1.api.collections.tenants.Tenant;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
@@ -269,7 +269,7 @@ void testAddReferenceToTenantObject() throws IOException {
 
     multiTenantA.data.referenceAdd(objectId, // from_uuid
         "hasCategory", // from_property
-        Reference.object(categoryUuid) // to
+        ObjectReference.object(categoryUuid) // to
     );
     // END AddCrossRef
 
diff --git a/_includes/code/java-v6/src/test/java/ManageObjectsImportTest.java b/_includes/code/java-v6/src/test/java/ManageObjectsImportTest.java
index 3375e041..10476ace 100644
--- a/_includes/code/java-v6/src/test/java/ManageObjectsImportTest.java
+++ b/_includes/code/java-v6/src/test/java/ManageObjectsImportTest.java
@@ -3,10 +3,10 @@
 import io.weaviate.client6.v1.api.collections.Property;
 import io.weaviate.client6.v1.api.collections.ReferenceProperty;
 import io.weaviate.client6.v1.api.collections.VectorConfig;
-import io.weaviate.client6.v1.api.collections.Vectors;
 import io.weaviate.client6.v1.api.collections.data.BatchReference;
+import io.weaviate.client6.v1.api.collections.Vectors;
+import io.weaviate.client6.v1.api.collections.WeaviateObject;
 import io.weaviate.client6.v1.api.collections.data.InsertManyResponse;
-import io.weaviate.client6.v1.api.collections.data.WriteWeaviateObject;
 import io.weaviate.client6.v1.api.collections.query.QueryReference;
 
 import org.junit.jupiter.api.AfterAll;
@@ -113,19 +113,18 @@ void testBasicBatchImport() throws IOException {
   // END ServerSideBatchImportExample
 
   @Test
-  // TODO[g-despot]: DX: Somewhere it's string somewhere it's UUID, can we supply it as a string directly without ObjectMetadata?
   void testBatchImportWithID() throws IOException {
     client.collections.create("MyCollection",
         col -> col.vectorConfig(VectorConfig.selfProvided()));
 
     // START BatchImportWithIDExample
-    List<WriteWeaviateObject<Map<String, Object>>> dataObjects =
-        new ArrayList<>();
+    List<WeaviateObject<Map<String, Object>>> dataObjects = new ArrayList<>();
     for (int i = 0; i < 5; i++) {
       Map<String, Object> dataRow = Map.of("title", "Object " + (i + 1));
       UUID objUuid = generateUuid5(dataRow.toString());
-      dataObjects.add(WriteWeaviateObject
-          .of(obj -> obj.properties(dataRow).uuid(objUuid.toString())));
+
+      dataObjects.add(WeaviateObject.<Map<String, Object>>of(
+          obj -> obj.properties(dataRow).uuid(objUuid.toString())));
     }
 
     var collection = client.collections.use("MyCollection");
@@ -156,16 +155,18 @@ void testBatchImportWithVector() throws IOException {
         col -> col.vectorConfig(VectorConfig.selfProvided()));
 
     // START BatchImportWithVectorExample
-    List<WriteWeaviateObject<Map<String, Object>>> dataObjects =
-        new ArrayList<>();
+    List<WeaviateObject<Map<String, Object>>> dataObjects = new ArrayList<>();
     float[] vector = new float[10]; // Using a small vector for demonstration
     Arrays.fill(vector, 0.1f);
 
     for (int i = 0; i < 5; i++) {
       Map<String, Object> dataRow = Map.of("title", "Object " + (i + 1));
       UUID objUuid = generateUuid5(dataRow.toString());
-      dataObjects.add(WriteWeaviateObject.of(obj -> obj.properties(dataRow)
-          .uuid(objUuid.toString()).vectors(Vectors.of(vector))));
+
+      dataObjects.add(
+          WeaviateObject.<Map<String, Object>>of(obj -> obj.properties(dataRow)
+              .uuid(objUuid.toString())
+              .vectors(Vectors.of(vector))));
     }
 
     var collection = client.collections.use("MyCollection");
@@ -192,10 +193,10 @@ void testBatchImportWithVector() throws IOException {
   void testBatchImportWithCrossReference() throws IOException {
     client.collections.create("Publication",
         col -> col.properties(Property.text("title")));
+
     client.collections.create("Author",
         col -> col.properties(Property.text("name"))
-            .references(
-                new ReferenceProperty("writesFor", List.of("Publication"))));
+            .references(ReferenceProperty.to("writesFor", "Publication")));
 
     var authors = client.collections.use("Author");
     var publications = client.collections.use("Publication");
@@ -233,6 +234,7 @@ void testImportWithNamedVectors() throws IOException {
             .vectorConfig(VectorConfig.selfProvided("title"),
                 VectorConfig.selfProvided("body"))
             .properties(Property.text("title"), Property.text("body")));
+
     // START BatchImportWithNamedVectors
     // Prepare the data and vectors
     List<Map<String, Object>> dataRows = new ArrayList<>();
@@ -255,16 +257,17 @@ void testImportWithNamedVectors() throws IOException {
     CollectionHandle<Map<String, Object>> collection =
         client.collections.use("MyCollection");
 
-    List<WriteWeaviateObject<Map<String, Object>>> objectsToInsert =
+    List<WeaviateObject<Map<String, Object>>> objectsToInsert =
         new ArrayList<>();
     for (int i = 0; i < dataRows.size(); i++) {
       int index = i;
       objectsToInsert.add(
           // highlight-start
           // Use the Builder with the EXACT matching generic types
-          WriteWeaviateObject.of(v -> v.properties(dataRows.get(index))
-              .vectors(Vectors.of("title", titleVectors.get(index)),
-                  Vectors.of("body", bodyVectors.get(index)))));
+          WeaviateObject
+              .<Map<String, Object>>of(v -> v.properties(dataRows.get(index))
+                  .vectors(Vectors.of("title", titleVectors.get(index)))
+                  .vectors(Vectors.of("body", bodyVectors.get(index)))));
       // highlight-end
 
     }
diff --git a/_includes/code/java-v6/src/test/java/ManageObjectsReadAllTest.java b/_includes/code/java-v6/src/test/java/ManageObjectsReadAllTest.java
index 067bb121..64d2d90c 100644
--- a/_includes/code/java-v6/src/test/java/ManageObjectsReadAllTest.java
+++ b/_includes/code/java-v6/src/test/java/ManageObjectsReadAllTest.java
@@ -1,6 +1,6 @@
 import io.weaviate.client6.v1.api.WeaviateClient;
 import io.weaviate.client6.v1.api.collections.CollectionHandle;
-import io.weaviate.client6.v1.api.collections.query.ReadWeaviateObject;
+import io.weaviate.client6.v1.api.collections.WeaviateObject;
 import io.weaviate.client6.v1.api.collections.tenants.Tenant;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -63,8 +63,7 @@ void testReadAllProps() {
         client.collections.use("WineReview");
 
     // highlight-start
-    for (ReadWeaviateObject<Map<String, Object>> item : collection
-        .paginate()) {
+    for (WeaviateObject<Map<String, Object>> item : collection.paginate()) {
       // highlight-end
       System.out.printf("%s %s\n", item.uuid(), item.properties());
     }
@@ -77,12 +76,11 @@ void testReadAllVectors() {
     CollectionHandle<Map<String, Object>> collection =
         client.collections.use("WineReview");
 
-    for (ReadWeaviateObject<Map<String, Object>> item : collection
-        .paginate(
-            // highlight-start
-            i -> i.returnMetadata() // If using named vectors, you can specify ones to include
-        // highlight-end
-        )) {
+    for (WeaviateObject<Map<String, Object>> item : collection.paginate(
+        // highlight-start
+        i -> i.returnMetadata() // If using named vectors, you can specify ones to include
+    // highlight-end
+    )) {
       System.out.println(item.properties());
       // highlight-start
       System.out.println(item.vectors());
@@ -106,7 +104,7 @@ void testReadAllTenants() {
     for (Tenant tenant : tenants) {
       // Iterate through objects within each tenant
       // highlight-start
-      for (ReadWeaviateObject<Map<String, Object>> item : multiCollection
+      for (WeaviateObject<Map<String, Object>> item : multiCollection
           .withTenant(tenant.name())
           .paginate()) {
         // highlight-end
diff --git a/_includes/code/java-v6/src/test/java/ManageObjectsReadTest.java b/_includes/code/java-v6/src/test/java/ManageObjectsReadTest.java
index 9334103b..142f2b13 100644
--- a/_includes/code/java-v6/src/test/java/ManageObjectsReadTest.java
+++ b/_includes/code/java-v6/src/test/java/ManageObjectsReadTest.java
@@ -56,7 +56,7 @@ void testReadObjectWithVector() {
     );
 
     dataObjectOpt.ifPresent(dataObject -> System.out
-        .println(Arrays.toString(dataObject.metadata().vectors().getSingle("default"))));
+        .println(Arrays.toString(dataObject.vectors().getSingle("default"))));
     // END ReadObjectWithVector
   }
 
@@ -84,7 +84,7 @@ void testReadObjectNamedVectors() {
     // The vectors are returned in the `vectors` property as a dictionary
     dataObjectOpt.ifPresent(dataObject -> {
       for (String n : vectorNames) {
-        float[] vector = dataObject.metadata().vectors().getSingle(n);
+        float[] vector = dataObject.vectors().getSingle(n);
         if (vector != null) {
           System.out.printf("Vector '%s': %s...\n", n, Arrays.toString(Arrays.copyOf(vector, 5)));
         }
diff --git a/_includes/code/java-v6/src/test/java/ManageObjectsUpdateTest.java b/_includes/code/java-v6/src/test/java/ManageObjectsUpdateTest.java
index 2de1416e..74c472c6 100644
--- a/_includes/code/java-v6/src/test/java/ManageObjectsUpdateTest.java
+++ b/_includes/code/java-v6/src/test/java/ManageObjectsUpdateTest.java
@@ -3,7 +3,7 @@
 import io.weaviate.client6.v1.api.collections.Property;
 import io.weaviate.client6.v1.api.collections.VectorConfig;
 import io.weaviate.client6.v1.api.collections.Vectors;
-import io.weaviate.client6.v1.api.collections.query.ReadWeaviateObject;
+import io.weaviate.client6.v1.api.collections.WeaviateObject;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -82,7 +82,7 @@ private static void delProps(WeaviateClient client, String uuidToUpdate, String
     CollectionHandle<Map<String, Object>> collection = client.collections.use(collectionName);
 
     // fetch the object to update
-    Optional<ReadWeaviateObject<Map<String, Object>>> objectDataOpt =
+    Optional<WeaviateObject<Map<String, Object>>> objectDataOpt =
         collection.query.fetchObjectById(uuidToUpdate);
     if (objectDataOpt.isEmpty()) {
       return;
@@ -115,7 +115,7 @@ void testUpdateAndReplaceFlow() throws IOException {
     );
     // END UpdateProps
 
-    Optional<ReadWeaviateObject<Map<String, Object>>> result1 =
+    Optional<WeaviateObject<Map<String, Object>>> result1 =
         jeopardy.query.fetchObjectById(uuid);
     assertThat(result1).isPresent();
     assertThat(result1.get().properties().get("points")).isEqualTo(100.0);
@@ -131,10 +131,10 @@ void testUpdateAndReplaceFlow() throws IOException {
     );
     // END UpdateVector
 
-    Optional<ReadWeaviateObject<Map<String, Object>>> result2 =
+    Optional<WeaviateObject<Map<String, Object>>> result2 =
         jeopardy.query.fetchObjectById(uuid, q -> q.includeVector());
     assertThat(result2).isPresent();
-    assertThat(result2.get().metadata().vectors().getSingle("default")).hasSize(384);
+    assertThat(result2.get().vectors().getSingle("default")).hasSize(384);
 
     // START UpdateNamedVector
     CollectionHandle<Map<String, Object>> reviews = client.collections.use("WineReviewNV");
@@ -166,7 +166,7 @@ void testUpdateAndReplaceFlow() throws IOException {
         )));
     // END Replace
 
-    Optional<ReadWeaviateObject<Map<String, Object>>> result3 =
+    Optional<WeaviateObject<Map<String, Object>>> result3 =
         jeopardy.query.fetchObjectById(uuid);
     assertThat(result3).isPresent();
     assertThat(result3.get().properties().get("answer")).isEqualTo("Replaced");
@@ -176,7 +176,7 @@ void testUpdateAndReplaceFlow() throws IOException {
     delProps(client, uuid, "JeopardyQuestion", List.of("answer"));
     // END DelProps
 
-    Optional<ReadWeaviateObject<Map<String, Object>>> result4 =
+    Optional<WeaviateObject<Map<String, Object>>> result4 =
         jeopardy.query.fetchObjectById(uuid);
     assertThat(result4).isPresent();
     assertThat(result4.get().properties().get("answer")).isNull();
diff --git a/_includes/code/java-v6/src/test/java/SearchBasicTest.java b/_includes/code/java-v6/src/test/java/SearchBasicTest.java
index 1989e576..a59aa53e 100644
--- a/_includes/code/java-v6/src/test/java/SearchBasicTest.java
+++ b/_includes/code/java-v6/src/test/java/SearchBasicTest.java
@@ -110,7 +110,7 @@ void testGetObjectVector() {
         .limit(1));
 
     if (!response.objects().isEmpty()) {
-      System.out.println(response.objects().get(0).metadata().vectors());
+      System.out.println(response.objects().get(0).vectors());
     }
     // END GetObjectVector
   }
@@ -167,7 +167,7 @@ void testGetWithMetadata() {
 
     for (var o : response.objects()) {
       System.out.println(o.properties()); // View the returned properties
-      System.out.println(o.metadata().creationTimeUnix()); // View the returned creation time
+      System.out.println(o.createdAt()); // View the returned creation time
     }
     // END GetWithMetadata
   }
diff --git a/_includes/code/java-v6/src/test/java/SearchFiltersTest.java b/_includes/code/java-v6/src/test/java/SearchFiltersTest.java
index 3f536b78..742cf8ab 100644
--- a/_includes/code/java-v6/src/test/java/SearchFiltersTest.java
+++ b/_includes/code/java-v6/src/test/java/SearchFiltersTest.java
@@ -3,7 +3,7 @@
 import io.weaviate.client6.v1.api.collections.Property;
 import io.weaviate.client6.v1.api.collections.VectorConfig;
 import io.weaviate.client6.v1.api.collections.data.InsertManyResponse;
-import io.weaviate.client6.v1.api.collections.data.WriteWeaviateObject;
+import io.weaviate.client6.v1.api.collections.WeaviateObject;
 import io.weaviate.client6.v1.api.collections.query.Filter;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -318,7 +318,7 @@ void testFilterByDateDatatype() throws IOException {
       var collection = client.collections.use(collectionName);
 
       // 1. Create a list to hold all the objects for insertion.
-      List<WriteWeaviateObject<Map<String, Object>>> objects =
+      List<WeaviateObject<Map<String, Object>>> objects =
           new ArrayList<>();
 
       // 2. Populate the list with your data.
@@ -332,7 +332,7 @@ void testFilterByDateDatatype() throws IOException {
                     day),
                 "some_date",
                 date.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME));
-            objects.add(WriteWeaviateObject.<Map<String, Object>>of(
+            objects.add(WeaviateObject.<Map<String, Object>>of(
                 builder -> builder.properties(properties)));
           }
         }
diff --git a/_includes/code/java-v6/src/test/java/SearchHybridTest.java b/_includes/code/java-v6/src/test/java/SearchHybridTest.java
index 47aaac3a..a6e81dc5 100644
--- a/_includes/code/java-v6/src/test/java/SearchHybridTest.java
+++ b/_includes/code/java-v6/src/test/java/SearchHybridTest.java
@@ -84,7 +84,7 @@ void testHybridWithScore() {
       System.out.println(o.properties());
       // highlight-start
       System.out
-          .println(o.metadata().score() + " " + o.metadata().explainScore());
+          .println(o.queryMetadata().score() + " " + o.queryMetadata().explainScore());
       // highlight-end
     }
     // END HybridWithScorePython
diff --git a/_includes/code/java-v6/src/test/java/SearchKeywordTest.java b/_includes/code/java-v6/src/test/java/SearchKeywordTest.java
index 41ccd758..7473adf6 100644
--- a/_includes/code/java-v6/src/test/java/SearchKeywordTest.java
+++ b/_includes/code/java-v6/src/test/java/SearchKeywordTest.java
@@ -93,7 +93,7 @@ void testBM25WithScore() {
     for (var o : response.objects()) {
       System.out.println(o.properties());
       // highlight-start
-      System.out.println(o.metadata().score());
+      System.out.println(o.queryMetadata().score());
       // highlight-end
     }
     // END BM25WithScore
@@ -148,7 +148,7 @@ void testBM25WithProperties() {
 
     for (var o : response.objects()) {
       System.out.println(o.properties());
-      System.out.println(o.metadata().score());
+      System.out.println(o.queryMetadata().score());
     }
     // END BM25WithProperties
   }
diff --git a/_includes/code/java-v6/src/test/java/SearchMultiTargetTest.java b/_includes/code/java-v6/src/test/java/SearchMultiTargetTest.java
index 2bbced87..33e8956d 100644
--- a/_includes/code/java-v6/src/test/java/SearchMultiTargetTest.java
+++ b/_includes/code/java-v6/src/test/java/SearchMultiTargetTest.java
@@ -119,7 +119,7 @@ void testMultiBasic() throws Exception {
     for (var o : response.objects()) {
       System.out.println(objectMapper.writerWithDefaultPrettyPrinter()
           .writeValueAsString(o.properties()));
-      System.out.println("Distance: " + o.metadata().distance());
+      System.out.println("Distance: " + o.queryMetadata().distance());
     }
     // END MultiBasic
     assertThat(response.objects()).hasSize(2);
@@ -135,12 +135,10 @@ void testMultiTargetNearVector() throws Exception {
 
     float[] v1 = someResult.objects()
         .get(0)
-        .metadata()
         .vectors()
         .getSingle("jeopardy_questions_vector");
     float[] v2 = someResult.objects()
         .get(1)
-        .metadata()
         .vectors()
         .getSingle("jeopardy_answers_vector");
     assertThat(v1).isNotEmpty();
@@ -159,7 +157,7 @@ void testMultiTargetNearVector() throws Exception {
     for (var o : response.objects()) {
       System.out.println(objectMapper.writerWithDefaultPrettyPrinter()
           .writeValueAsString(o.properties()));
-      System.out.println("Distance: " + o.metadata().distance());
+      System.out.println("Distance: " + o.queryMetadata().distance());
     }
     // END MultiTargetNearVector
     assertThat(response.objects()).hasSize(2);
@@ -175,17 +173,14 @@ void testMultiTargetMultipleNearVectors() throws Exception {
 
     float[] v1 = someResult.objects()
         .get(0)
-        .metadata()
         .vectors()
         .getSingle("jeopardy_questions_vector");
     float[] v2 = someResult.objects()
         .get(1)
-        .metadata()
         .vectors()
         .getSingle("jeopardy_answers_vector");
     float[] v3 = someResult.objects()
         .get(2)
-        .metadata()
         .vectors()
         .getSingle("jeopardy_answers_vector");
     assertThat(v1).isNotEmpty();
@@ -206,7 +201,7 @@ void testMultiTargetMultipleNearVectors() throws Exception {
     for (var o : responseV1.objects()) {
       System.out.println(objectMapper.writerWithDefaultPrettyPrinter()
           .writeValueAsString(o.properties()));
-      System.out.println("Distance: " + o.metadata().distance());
+      System.out.println("Distance: " + o.queryMetadata().distance());
     }
     // END MultiTargetMultipleNearVectorsV1
     assertThat(responseV1.objects()).hasSize(2);
@@ -227,7 +222,7 @@ void testMultiTargetMultipleNearVectors() throws Exception {
     for (var o : responseV2.objects()) {
       System.out.println(objectMapper.writerWithDefaultPrettyPrinter()
           .writeValueAsString(o.properties()));
-      System.out.println("Distance: " + o.metadata().distance());
+      System.out.println("Distance: " + o.queryMetadata().distance());
     }
     // END MultiTargetMultipleNearVectorsV2
     assertThat(responseV2.objects()).hasSize(2);
@@ -250,7 +245,7 @@ void testMultiTargetWithSimpleJoin() throws Exception {
     for (var o : response.objects()) {
       System.out.println(objectMapper.writerWithDefaultPrettyPrinter()
           .writeValueAsString(o.properties()));
-      System.out.println("Distance: " + o.metadata().distance());
+      System.out.println("Distance: " + o.queryMetadata().distance());
     }
     // END MultiTargetWithSimpleJoin
     assertThat(response.objects()).hasSize(2);
@@ -273,7 +268,7 @@ void testMultiTargetManualWeights() throws Exception {
     for (var o : response.objects()) {
       System.out.println(objectMapper.writerWithDefaultPrettyPrinter()
           .writeValueAsString(o.properties()));
-      System.out.println("Distance: " + o.metadata().distance());
+      System.out.println("Distance: " + o.queryMetadata().distance());
     }
     // END MultiTargetManualWeights
     assertThat(response.objects()).hasSize(2);
@@ -296,7 +291,7 @@ void testMultiTargetRelativeScore() throws Exception {
     for (var o : response.objects()) {
       System.out.println(objectMapper.writerWithDefaultPrettyPrinter()
           .writeValueAsString(o.properties()));
-      System.out.println("Distance: " + o.metadata().distance());
+      System.out.println("Distance: " + o.queryMetadata().distance());
     }
     // END MultiTargetRelativeScore
     assertThat(response.objects()).hasSize(2);
diff --git a/_includes/code/java-v6/src/test/java/SearchSimilarityTest.java b/_includes/code/java-v6/src/test/java/SearchSimilarityTest.java
index 0470df37..2426df0a 100644
--- a/_includes/code/java-v6/src/test/java/SearchSimilarityTest.java
+++ b/_includes/code/java-v6/src/test/java/SearchSimilarityTest.java
@@ -46,7 +46,7 @@ void testNamedVectorNearText() {
 
     for (var o : response.objects()) {
       System.out.println(o.properties());
-      System.out.println(o.metadata().distance());
+      System.out.println(o.queryMetadata().distance());
     }
     // END NamedVectorNearText
   }
@@ -64,7 +64,7 @@ void testGetNearText() {
 
     for (var o : response.objects()) {
       System.out.println(o.properties());
-      System.out.println(o.metadata().distance());
+      System.out.println(o.queryMetadata().distance());
     }
     // END GetNearText
   }
@@ -86,7 +86,7 @@ void testGetNearObject() {
 
     for (var o : response.objects()) {
       System.out.println(o.properties());
-      System.out.println(o.metadata().distance());
+      System.out.println(o.queryMetadata().distance());
     }
     // END GetNearObject
   }
@@ -99,11 +99,8 @@ void testGetNearVector() {
         jeopardy.query.fetchObjects(q -> q.limit(1).includeVector());
     if (initialResponse.objects().isEmpty())
       return; // Skip test if no data
-    var queryVector = initialResponse.objects()
-        .get(0)
-        .metadata()
-        .vectors()
-        .getSingle("default");
+    var queryVector =
+        initialResponse.objects().get(0).vectors().getSingle("default");
 
     // START GetNearVector
     // highlight-start
@@ -113,7 +110,7 @@ void testGetNearVector() {
 
     for (var o : response.objects()) {
       System.out.println(o.properties());
-      System.out.println(o.metadata().distance());
+      System.out.println(o.queryMetadata().distance());
     }
     // END GetNearVector
   }
@@ -132,7 +129,7 @@ void testGetLimitOffset() {
 
     for (var o : response.objects()) {
       System.out.println(o.properties());
-      System.out.println(o.metadata().distance());
+      System.out.println(o.queryMetadata().distance());
     }
     // END GetLimitOffset
   }
@@ -150,7 +147,7 @@ void testGetWithDistance() {
 
     for (var o : response.objects()) {
       System.out.println(o.properties());
-      System.out.println(o.metadata().distance());
+      System.out.println(o.queryMetadata().distance());
     }
     // END GetWithDistance
   }
@@ -168,7 +165,7 @@ void testAutolimit() {
 
     for (var o : response.objects()) {
       System.out.println(o.properties());
-      System.out.println(o.metadata().distance());
+      System.out.println(o.queryMetadata().distance());
     }
     // END Autocut
   }
@@ -188,9 +185,9 @@ void testGetWithGroupby() {
             2 // maximum objects per group
         ));
     // highlight-end
-    response.objects().getFirst().metadata().vectors().getSingle("default");
+    // response.objects().getFirst().vectors().getSingle("default");
     for (var o : response.objects()) {
-      System.out.println(o.metadata().uuid());
+      // System.out.println(o.uuid());
       System.out.println(o.belongsToGroup());
       System.out.println(o.metadata().distance());
     }
@@ -221,7 +218,7 @@ void testGetWithWhere() {
 
     for (var o : response.objects()) {
       System.out.println(o.properties());
-      System.out.println(o.metadata().distance());
+      System.out.println(o.queryMetadata().distance());
     }
     // END GetWithFilter
   }
diff --git a/_includes/code/java-v6/src/test/java/StarterGuidesCustomVectorsTest.java b/_includes/code/java-v6/src/test/java/StarterGuidesCustomVectorsTest.java
index db19ece7..0597669d 100644
--- a/_includes/code/java-v6/src/test/java/StarterGuidesCustomVectorsTest.java
+++ b/_includes/code/java-v6/src/test/java/StarterGuidesCustomVectorsTest.java
@@ -6,7 +6,7 @@
 import io.weaviate.client6.v1.api.collections.Property;
 import io.weaviate.client6.v1.api.collections.VectorConfig;
 import io.weaviate.client6.v1.api.collections.Vectors;
-import io.weaviate.client6.v1.api.collections.data.WriteWeaviateObject;
+import io.weaviate.client6.v1.api.collections.WeaviateObject;
 import io.weaviate.client6.v1.api.collections.query.Metadata;
 import org.junit.jupiter.api.Test;
 
@@ -75,7 +75,7 @@ void testBringYourOwnVectors() throws Exception {
       CollectionHandle<Map<String, Object>> questions =
           client.collections.use(collectionName);
       // Declare the list with the specific generic signature required by insertMany
-      List<WriteWeaviateObject<Map<String, Object>>> questionObjs =
+      List<WeaviateObject<Map<String, Object>>> questionObjs =
           new ArrayList<>();
 
       for (JeopardyQuestionWithVector d : data) {
@@ -84,7 +84,7 @@ void testBringYourOwnVectors() throws Exception {
             d.question, "category", d.category);
 
         // Use the explicit Builder to construct the object with a custom vector
-        questionObjs.add(WriteWeaviateObject.of(v -> v.properties(properties)
+        questionObjs.add(WeaviateObject.of(v -> v.properties(properties)
             .uuid(UUID.randomUUID().toString())
             .vectors(Vectors.of(d.vector))));
         // highlight-end
@@ -113,7 +113,7 @@ void testBringYourOwnVectors() throws Exception {
       // ===== Test query results =====
       assertThat(response.objects()).hasSize(2);
       // The first result should be the object we used for the query, with near-perfect certainty
-      assertThat(response.objects().get(0).metadata().certainty()).isNotNull()
+      assertThat(response.objects().get(0).queryMetadata().certainty()).isNotNull()
           .isGreaterThan(0.999f);
       assertThat(response.objects().get(0).properties()).isNotNull()
           .isInstanceOf(Map.class);
diff --git a/_includes/code/java-v6/src/test/java/StarterGuidesGenerativeTest.java b/_includes/code/java-v6/src/test/java/StarterGuidesGenerativeTest.java
index b3f040f8..d1a4035a 100644
--- a/_includes/code/java-v6/src/test/java/StarterGuidesGenerativeTest.java
+++ b/_includes/code/java-v6/src/test/java/StarterGuidesGenerativeTest.java
@@ -4,7 +4,7 @@
 import io.weaviate.client6.v1.api.collections.Generative;
 import io.weaviate.client6.v1.api.collections.Property;
 import io.weaviate.client6.v1.api.collections.VectorConfig;
-import io.weaviate.client6.v1.api.collections.data.WriteWeaviateObject;
+import io.weaviate.client6.v1.api.collections.WeaviateObject;
 import org.junit.jupiter.api.Test;
 
 import java.io.BufferedReader;
@@ -94,7 +94,7 @@ void testFullWorkflow() throws Exception {
       assertThat(client.collections.exists(gitBookCollectionName)).isTrue();
 
       // START ImportData
-      List<WriteWeaviateObject<Map<String, Object>>> chunksList =
+      List<WeaviateObject<Map<String, Object>>> chunksList =
           new ArrayList<>();
       for (int i = 0; i < chunkedText.size(); i++) {
         Map<String, Object> dataProperties = new HashMap<>();
@@ -102,7 +102,7 @@ void testFullWorkflow() throws Exception {
         dataProperties.put("chunk", chunkedText.get(i));
         dataProperties.put("chunk_index", (long) i); // Use long for integer
 
-        chunksList.add(WriteWeaviateObject.of(b -> b.properties(dataProperties)));
+        chunksList.add(WeaviateObject.of(b -> b.properties(dataProperties)));
       }
       chunks.data.insertMany(chunksList);
       // END ImportData
diff --git a/_includes/code/java-v6/src/test/java/quickstart/QuickstartCreateVectors.java b/_includes/code/java-v6/src/test/java/quickstart/QuickstartCreateVectors.java
index 9373ab89..6272eb53 100644
--- a/_includes/code/java-v6/src/test/java/quickstart/QuickstartCreateVectors.java
+++ b/_includes/code/java-v6/src/test/java/quickstart/QuickstartCreateVectors.java
@@ -6,8 +6,8 @@
 import io.weaviate.client6.v1.api.collections.Property;
 import io.weaviate.client6.v1.api.collections.VectorConfig;
 import io.weaviate.client6.v1.api.collections.Vectors;
+import io.weaviate.client6.v1.api.collections.WeaviateObject;
 import io.weaviate.client6.v1.api.collections.data.InsertManyResponse;
-import io.weaviate.client6.v1.api.collections.data.WriteWeaviateObject;
 import java.util.Map;
 
 public class QuickstartCreateVectors {
@@ -69,11 +69,11 @@ public static void main(String[] args) throws Exception {
       CollectionHandle<Map<String, Object>> movies =
           client.collections.use(collectionName);
       InsertManyResponse insertResponse = movies.data.insertMany(
-          WriteWeaviateObject.of(v -> v.properties(props1)
+          WeaviateObject.of(v -> v.properties(props1)
               .vectors(Vectors.of(vector1))),
-          WriteWeaviateObject.of(v -> v.properties(props2)
+          WeaviateObject.of(v -> v.properties(props2)
               .vectors(Vectors.of(vector2))),
-          WriteWeaviateObject.of(v -> v.properties(props3)
+          WeaviateObject.of(v -> v.properties(props3)
               .vectors(Vectors.of(vector3))));
       if (!insertResponse.errors().isEmpty()) {
         System.err.println("Errors during import: " + insertResponse.errors());
diff --git a/_includes/code/java-v6/src/test/java/quickstart/QuickstartLocalCreateVectors.java b/_includes/code/java-v6/src/test/java/quickstart/QuickstartLocalCreateVectors.java
index 87c53bf6..f31eaad3 100644
--- a/_includes/code/java-v6/src/test/java/quickstart/QuickstartLocalCreateVectors.java
+++ b/_includes/code/java-v6/src/test/java/quickstart/QuickstartLocalCreateVectors.java
@@ -6,8 +6,8 @@
 import io.weaviate.client6.v1.api.collections.Property;
 import io.weaviate.client6.v1.api.collections.VectorConfig;
 import io.weaviate.client6.v1.api.collections.Vectors;
+import io.weaviate.client6.v1.api.collections.WeaviateObject;
 import io.weaviate.client6.v1.api.collections.data.InsertManyResponse;
-import io.weaviate.client6.v1.api.collections.data.WriteWeaviateObject;
 import java.util.Map;
 
 public class QuickstartLocalCreateVectors {
@@ -63,11 +63,11 @@ public static void main(String[] args) throws Exception {
       CollectionHandle<Map<String, Object>> movies =
           client.collections.use(collectionName);
       InsertManyResponse insertResponse = movies.data.insertMany(
-          WriteWeaviateObject.of(v -> v.properties(props1)
+          WeaviateObject.of(v -> v.properties(props1)
               .vectors(Vectors.of(vector1))),
-          WriteWeaviateObject.of(v -> v.properties(props2)
+          WeaviateObject.of(v -> v.properties(props2)
               .vectors(Vectors.of(vector2))),
-          WriteWeaviateObject.of(v -> v.properties(props3)
+          WeaviateObject.of(v -> v.properties(props3)
               .vectors(Vectors.of(vector3))));
 
       if (!insertResponse.errors().isEmpty()) {