diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/bsontojson/Book.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/bsontojson/Book.java
new file mode 100644
index 0000000000..44e4ecb539
--- /dev/null
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/bsontojson/Book.java
@@ -0,0 +1,168 @@
+package com.baeldung.bsontojson;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.HashSet;
+import java.util.Set;
+
+import dev.morphia.annotations.Embedded;
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Field;
+import dev.morphia.annotations.Id;
+import dev.morphia.annotations.Index;
+import dev.morphia.annotations.IndexOptions;
+import dev.morphia.annotations.Indexes;
+import dev.morphia.annotations.Property;
+import dev.morphia.annotations.Reference;
+import dev.morphia.annotations.Validation;
+
+@Entity("Books")
+@Indexes({ @Index(fields = @Field("title"), options = @IndexOptions(name = "book_title")) })
+@Validation("{ price : { $gt : 0 } }")
+public class Book {
+    @Id
+    private String isbn;
+    @Property
+    private String title;
+    private String author;
+    @Embedded
+    private Publisher publisher;
+    @Property("price")
+    private double cost;
+    @Reference
+    private Set<Book> companionBooks;
+    @Property
+    private LocalDateTime publishDate;
+
+    public Book() {
+
+    }
+
+    public Book(String isbn, String title, String author, double cost, Publisher publisher) {
+        this.isbn = isbn;
+        this.title = title;
+        this.author = author;
+        this.cost = cost;
+        this.publisher = publisher;
+        this.companionBooks = new HashSet<>();
+    }
+
+    // Getters and setters ...
+    public String getIsbn() {
+        return isbn;
+    }
+
+    public Book setIsbn(String isbn) {
+        this.isbn = isbn;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Book setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public Book setAuthor(String author) {
+        this.author = author;
+        return this;
+    }
+
+    public Publisher getPublisher() {
+        return publisher;
+    }
+
+    public Book setPublisher(Publisher publisher) {
+        this.publisher = publisher;
+        return this;
+    }
+
+    public double getCost() {
+        return cost;
+    }
+
+    public Book setCost(double cost) {
+        this.cost = cost;
+        return this;
+    }
+
+    public LocalDateTime getPublishDate() {
+        return publishDate;
+    }
+
+    public Book setPublishDate(LocalDateTime publishDate) {
+        this.publishDate = publishDate;
+        return this;
+    }
+
+    public Set<Book> getCompanionBooks() {
+        return companionBooks;
+    }
+
+    public Book addCompanionBooks(Book book) {
+        if (companionBooks != null)
+            this.companionBooks.add(book);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "Book [isbn=" + isbn + ", title=" + title + ", author=" + author + ", publisher=" + publisher + ", cost=" + cost + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((author == null) ? 0 : author.hashCode());
+        long temp;
+        temp = Double.doubleToLongBits(cost);
+        result = prime * result + (int) (temp ^ (temp >>> 32));
+        result = prime * result + ((isbn == null) ? 0 : isbn.hashCode());
+        result = prime * result + ((publisher == null) ? 0 : publisher.hashCode());
+        result = prime * result + ((title == null) ? 0 : title.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Book other = (Book) obj;
+        if (author == null) {
+            if (other.author != null)
+                return false;
+        } else if (!author.equals(other.author))
+            return false;
+        if (Double.doubleToLongBits(cost) != Double.doubleToLongBits(other.cost))
+            return false;
+        if (isbn == null) {
+            if (other.isbn != null)
+                return false;
+        } else if (!isbn.equals(other.isbn))
+            return false;
+        if (publisher == null) {
+            if (other.publisher != null)
+                return false;
+        } else if (!publisher.equals(other.publisher))
+            return false;
+        if (title == null) {
+            if (other.title != null)
+                return false;
+        } else if (!title.equals(other.title))
+            return false;
+        return true;
+    }
+
+}
diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/bsontojson/Publisher.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/bsontojson/Publisher.java
new file mode 100644
index 0000000000..1ab262c82b
--- /dev/null
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/bsontojson/Publisher.java
@@ -0,0 +1,70 @@
+package com.baeldung.bsontojson;
+
+import org.bson.types.ObjectId;
+
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Id;
+
+@Entity
+public class Publisher {
+
+    @Id
+    private ObjectId id;
+    private String name;
+
+    public Publisher() {
+
+    }
+
+    public Publisher(ObjectId id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public ObjectId getId() {
+        return id;
+    }
+
+    public void setId(ObjectId id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Catalog [id=" + id + ", name=" + name + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Publisher other = (Publisher) obj;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
+
+}
diff --git a/persistence-modules/java-mongodb/src/test/java/com/baeldung/bsontojson/BsonToJsonLiveTest.java b/persistence-modules/java-mongodb/src/test/java/com/baeldung/bsontojson/BsonToJsonLiveTest.java
index 4e70394069..12053523f8 100644
--- a/persistence-modules/java-mongodb/src/test/java/com/baeldung/bsontojson/BsonToJsonLiveTest.java
+++ b/persistence-modules/java-mongodb/src/test/java/com/baeldung/bsontojson/BsonToJsonLiveTest.java
@@ -2,32 +2,18 @@ package com.baeldung.bsontojson;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
-import java.sql.Timestamp;
-import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.TimeZone;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.bson.Document;
-import org.bson.json.Converter;
 import org.bson.json.JsonMode;
 import org.bson.json.JsonWriterSettings;
-import org.bson.json.StrictJsonWriter;
 import org.bson.types.ObjectId;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.jupiter.api.AfterEach;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.baeldung.morphia.domain.Book;
-import com.baeldung.morphia.domain.Publisher;
 import com.mongodb.MongoClient;
 import com.mongodb.client.MongoDatabase;
 
@@ -42,7 +28,7 @@ public class BsonToJsonLiveTest {
     @BeforeClass
     public static void setUp() {
         Morphia morphia = new Morphia();
-        morphia.mapPackage("com.baeldung.morphia");
+        morphia.mapPackage("com.baeldung.bsontojson");
         datastore = morphia.createDatastore(new MongoClient(), DB_NAME);
         datastore.ensureIndexes();
         
@@ -72,7 +58,7 @@ public class BsonToJsonLiveTest {
         }
         
         String expectedJson = "{\"_id\": \"isbn\", " + 
-            "\"className\": \"com.baeldung.morphia.domain.Book\", " + 
+            "\"className\": \"com.baeldung.bsontojson.Book\", " + 
             "\"title\": \"title\", " + 
             "\"author\": \"author\", " + 
             "\"publisher\": {\"_id\": {\"$oid\": \"fffffffffffffffffffffffa\"}, " + 
@@ -100,7 +86,7 @@ public class BsonToJsonLiveTest {
         }
         
         String expectedJson = "{\"_id\": \"isbn\", " + 
-            "\"className\": \"com.baeldung.morphia.domain.Book\", " + 
+            "\"className\": \"com.baeldung.bsontojson.Book\", " + 
             "\"title\": \"title\", " + 
             "\"author\": \"author\", " + 
             "\"publisher\": {\"_id\": {\"$oid\": \"fffffffffffffffffffffffa\"}, " + 
@@ -127,7 +113,7 @@ public class BsonToJsonLiveTest {
         }
 
         String expectedJson = "{\"_id\": \"isbn\", " + 
-            "\"className\": \"com.baeldung.morphia.domain.Book\", " + 
+            "\"className\": \"com.baeldung.bsontojson.Book\", " + 
             "\"title\": \"title\", " + 
             "\"author\": \"author\", " + 
             "\"publisher\": {\"_id\": {\"$oid\": \"fffffffffffffffffffffffa\"}, " +