diff --git a/src/db.rs b/src/db.rs
index 494e554..3b0cdf2 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -16,7 +16,7 @@ use rsb_derive::Builder;
 use serde::{Deserialize, Serialize};
 use tracing::*;
 
-#[derive(Debug, PartialEq, Clone, Builder)]
+#[derive(Debug, Eq, PartialEq, Clone, Builder)]
 pub struct FirestoreDbOptions {
     pub google_project_id: String,
 
diff --git a/src/errors.rs b/src/errors.rs
index 1794e5c..79449eb 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -43,12 +43,12 @@ impl Error for FirestoreError {
     }
 }
 
-#[derive(Debug, PartialEq, Clone, Builder, Serialize, Deserialize)]
+#[derive(Debug, Eq, PartialEq, Clone, Builder, Serialize, Deserialize)]
 pub struct FirestoreErrorPublicGenericDetails {
     pub code: String,
 }
 
-#[derive(Debug, PartialEq, Clone, Builder)]
+#[derive(Debug, Eq, PartialEq, Clone, Builder)]
 pub struct FirestoreSystemError {
     pub public: FirestoreErrorPublicGenericDetails,
     pub message: String,
@@ -105,7 +105,7 @@ impl Display for FirestoreDataNotFoundError {
 
 impl std::error::Error for FirestoreDataNotFoundError {}
 
-#[derive(Debug, PartialEq, Clone, Builder, Serialize, Deserialize)]
+#[derive(Debug, Eq, PartialEq, Clone, Builder, Serialize, Deserialize)]
 pub struct FirestoreInvalidParametersPublicDetails {
     pub field: String,
     pub error: String,
@@ -124,7 +124,7 @@ impl Display for FirestoreInvalidParametersError {
 
 impl std::error::Error for FirestoreInvalidParametersError {}
 
-#[derive(Debug, PartialEq, Clone, Builder, Serialize, Deserialize)]
+#[derive(Debug, Eq, PartialEq, Clone, Builder, Serialize, Deserialize)]
 pub struct FirestoreInvalidJsonErrorPublicDetails {
     pub code: String,
 }
@@ -143,7 +143,7 @@ impl Display for FirestoreInvalidJsonError {
 
 impl std::error::Error for FirestoreInvalidJsonError {}
 
-#[derive(Debug, PartialEq, Clone, Builder)]
+#[derive(Debug, Eq, PartialEq, Clone, Builder)]
 pub struct FirestoreNetworkError {
     pub public: FirestoreErrorPublicGenericDetails,
     pub message: String,
diff --git a/src/query.rs b/src/query.rs
index a9b536e..cf3ed3d 100644
--- a/src/query.rs
+++ b/src/query.rs
@@ -1,7 +1,7 @@
 use gcloud_sdk::google::firestore::v1::*;
 use rsb_derive::Builder;
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, Eq, PartialEq, Clone)]
 pub enum FirestoreQueryCollection {
     Single(String),
     Group(Vec<String>),
@@ -241,7 +241,7 @@ impl FirestoreQueryFilter {
     }
 }
 
-#[derive(Debug, PartialEq, Clone, Builder)]
+#[derive(Debug, Eq, PartialEq, Clone, Builder)]
 pub struct FirestoreQueryOrder {
     field_name: String,
     direction: FirestoreQueryDirection,
@@ -263,7 +263,7 @@ impl FirestoreQueryOrder {
     }
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, Eq, PartialEq, Clone)]
 pub enum FirestoreQueryDirection {
     Ascending,
     Descending,
@@ -274,7 +274,7 @@ pub struct FirestoreQueryFilterComposite {
     pub for_all_filters: Vec<FirestoreQueryFilter>,
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, Eq, PartialEq, Clone)]
 pub enum FirestoreQueryFilterUnary {
     IsNan(String),
     IsNull(String),