diff --git a/aerospike-core/src/client.rs b/aerospike-core/src/client.rs
index f9e0751d..4866bfd6 100644
--- a/aerospike-core/src/client.rs
+++ b/aerospike-core/src/client.rs
@@ -53,7 +53,7 @@ use futures::AsyncReadExt;
 /// "single-bin". In "multi-bin" mode, partial records may be written or read by specifying the
 /// relevant subset of bins.
 pub struct Client {
-    cluster: Arc<Cluster>,
+    pub cluster: Arc<Cluster>,
 }
 
 unsafe impl Send for Client {}
diff --git a/aerospike-core/src/lib.rs b/aerospike-core/src/lib.rs
index 1a98c3f7..7e4da31b 100644
--- a/aerospike-core/src/lib.rs
+++ b/aerospike-core/src/lib.rs
@@ -152,7 +152,7 @@ pub use batch::BatchRead;
 pub use bin::{Bin, Bins};
 pub use client::Client;
 pub use cluster::Node;
-pub use commands::particle_type::ParticleType;
+pub use commands::{particle_type::ParticleType};
 pub use errors::{Error, ErrorKind, Result};
 pub use expressions::regex_flag::RegexFlag;
 pub use key::Key;
@@ -182,7 +182,7 @@ mod key;
 mod batch;
 mod client;
 mod cluster;
-mod commands;
+pub mod commands;
 pub mod expressions;
 mod msgpack;
 mod net;