diff --git a/Cargo.lock b/Cargo.lock
index bcb031a6a..578adda95 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1074,18 +1074,18 @@ dependencies = [
 
 [[package]]
 name = "derive_default_builder"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901f910d000b4d497a96caa9b442804a75cd808db65fbed0760de83addacb739"
+checksum = "a4bbfc9b0318750f07951ba6fdd6c886eaa0c68e1164cd2a7a8a540d21262aab"
 dependencies = [
  "derive_default_builder_derive",
 ]
 
 [[package]]
 name = "derive_default_builder_derive"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b88a547f730777da7ca3bfa6055c6420a429fa7f149cd767da5827200923413"
+checksum = "9e520b61247a9470ec86a98baf2aebae5c6dd0f25f02b1c87cafe45b06c160e7"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 9a2d84984..5d7379ec5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ logger = { path = "lib/logger" }
 # mogh
 run_command = { version = "0.0.6", features = ["async_tokio"] }
 slack = { version = "0.1.0", package = "slack_client_rs" }
-derive_default_builder = "0.1.6"
+derive_default_builder = "0.1.8"
 derive_empty_traits = "0.1.0"
 merge_config_files = "0.1.3"
 termination_signal = "0.1.3"
diff --git a/bin/tests/src/core.rs b/bin/tests/src/core.rs
index c7d9d95b4..5ec92a618 100644
--- a/bin/tests/src/core.rs
+++ b/bin/tests/src/core.rs
@@ -1,6 +1,5 @@
-use monitor_client::entities::deployment::{
-  DeploymentQuery, DeploymentQuerySpecifics,
-};
+use monitor_client::entities::deployment::DeploymentQuerySpecifics;
+use monitor_client::entities::resource::ResourceQuery;
 use monitor_client::MonitorClient;
 use monitor_client::{
   api::{execute, read, write},
@@ -39,16 +38,14 @@ pub async fn tests() -> anyhow::Result<()> {
 
   let deps = monitor
     .read(read::ListDeployments {
-      query: DeploymentQuery {
-        names: vec![
-          String::from("haboda"),
-          String::from("actual_shit"),
-        ],
-        specific: DeploymentQuerySpecifics {
-          server_ids: vec![String::from("64b4cb8c384ffd253e375ed2")],
-        },
-        ..Default::default()
-      },
+      query: ResourceQuery::builder()
+        .names([String::from("haboda"), String::from("actual_shit")])
+        .specific(
+          DeploymentQuerySpecifics::builder()
+            // .server_ids([String::from("")])
+            .build(),
+        )
+        .build(),
       // query: Default::default(),
     })
     .await?;