diff --git a/README.md b/README.md
index 52e216d..6a4a2e7 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ influxdb = { version = "0.4.0", features = ["derive"] }
 For an example with using Serde deserialization, please refer to [serde_integration](crate::integrations::serde_integration)
 
 ```rust
-use influxdb::{Client, Query, Timestamp};
+use influxdb::{Client, Query, Timestamp, ReadQuery};
 use influxdb::InfluxDbWriteable;
 use chrono::{DateTime, Utc};
 
@@ -88,7 +88,7 @@ async fn main() {
     assert!(write_result.is_ok(), "Write result was not okay");
 
     // Let's see if the data we wrote is there
-    let read_query = Query::raw_read_query("SELECT * FROM weather");
+    let read_query = ReadQuery::new("SELECT * FROM weather");
 
     let read_result = client.query(read_query).await;
     assert!(read_result.is_ok(), "Read result was not ok");
diff --git a/influxdb/Cargo.toml b/influxdb/Cargo.toml
index 034db89..f9067df 100644
--- a/influxdb/Cargo.toml
+++ b/influxdb/Cargo.toml
@@ -14,7 +14,7 @@ repository = "https://github.com/influxdb-rs/influxdb-rust"
 
 [dependencies]
 chrono = { version = "0.4.11", features = ["serde"] }
-futures = "0.3.4"
+futures-util = "0.3.17"
 http = "0.2.4"
 influxdb_derive = { version = "0.4.0", optional = true }
 lazy_static = "1.4.0"
diff --git a/influxdb/src/client/mod.rs b/influxdb/src/client/mod.rs
index 649c1dd..6b347fc 100644
--- a/influxdb/src/client/mod.rs
+++ b/influxdb/src/client/mod.rs
@@ -15,7 +15,7 @@
 //! assert_eq!(client.database_name(), "test");
 //! ```
 
-use futures::prelude::*;
+use futures_util::TryFutureExt;
 use http::StatusCode;
 #[cfg(feature = "reqwest")]
 use reqwest::{Client as HttpClient, Response as HttpResponse};
diff --git a/influxdb/src/integrations/serde_integration/mod.rs b/influxdb/src/integrations/serde_integration/mod.rs
index e0b6508..7c9681c 100644
--- a/influxdb/src/integrations/serde_integration/mod.rs
+++ b/influxdb/src/integrations/serde_integration/mod.rs
@@ -7,7 +7,6 @@
 //! `name`, InfluxDB provides alongside query results.
 //!
 //! ```rust,no_run
-//! use futures::prelude::*;
 //! use influxdb::{Client, Query};
 //! use serde::Deserialize;
 //!
diff --git a/influxdb/src/lib.rs b/influxdb/src/lib.rs
index ec5d3cf..675971e 100644
--- a/influxdb/src/lib.rs
+++ b/influxdb/src/lib.rs
@@ -26,7 +26,7 @@
 //! For an example with using Serde deserialization, please refer to [serde_integration](crate::integrations::serde_integration)
 //!
 //! ```rust,no_run
-//! use influxdb::{Client, Query, Timestamp};
+//! use influxdb::{Client, Query, Timestamp, ReadQuery};
 //! use influxdb::InfluxDbWriteable;
 //! use chrono::{DateTime, Utc};
 //!
@@ -56,7 +56,7 @@
 //!     assert!(write_result.is_ok(), "Write result was not okay");
 //!
 //!     // Let's see if the data we wrote is there
-//!     let read_query = Query::raw_read_query("SELECT * FROM weather");
+//!     let read_query = ReadQuery::new("SELECT * FROM weather");
 //!
 //!     let read_result = client.query(read_query).await;
 //!     assert!(read_result.is_ok(), "Read result was not ok");
diff --git a/influxdb/src/query/write_query.rs b/influxdb/src/query/write_query.rs
index 6ffc17c..57388c1 100644
--- a/influxdb/src/query/write_query.rs
+++ b/influxdb/src/query/write_query.rs
@@ -196,11 +196,11 @@ impl Query for WriteQuery {
             .join(",");
 
         Ok(ValidQuery(format!(
-            "{measurement}{tags} {fields}{time}",
+            "{measurement}{tags} {fields} {time}",
             measurement = LineProtoTerm::Measurement(&self.measurement).escape(),
             tags = tags,
             fields = fields,
-            time = format!(" {}", self.timestamp)
+            time = self.timestamp
         )))
     }
 
diff --git a/influxdb/tests/utilities.rs b/influxdb/tests/utilities.rs
index a1c9af4..ced7f89 100644
--- a/influxdb/tests/utilities.rs
+++ b/influxdb/tests/utilities.rs
@@ -1,5 +1,6 @@
-use futures::prelude::*;
+use futures_util::FutureExt;
 use influxdb::{Client, Error, ReadQuery};
+use std::future::Future;
 use std::panic::{AssertUnwindSafe, UnwindSafe};
 
 #[allow(dead_code)]