diff --git a/Cargo.toml b/Cargo.toml
index 26a20b1..b6aaf41 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/sundy-li/arrow_cli"
 edition = "2024"
 license = "Apache-2.0"
 name = "arrow_cli"
-version = "0.2.2"
+version = "0.2.3"
 
 
 [dependencies]
diff --git a/src/main.rs b/src/main.rs
index b51f1a9..97d2af8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,7 +10,6 @@ use clap::Parser;
 use tonic::transport::{ClientTlsConfig, Endpoint};
 
 #[derive(Debug, Parser, PartialEq)]
-#[command(disable_help_flag = true)]
 struct Args {
     #[clap(short = 'u', long, default_value = "root", help = "User name")]
     user: String,
@@ -18,12 +17,7 @@ struct Args {
     #[clap(short = 'p', long, default_value = "", help = "User password")]
     password: String,
 
-    #[clap(
-        short = 'h',
-        long,
-        default_value = "127.0.0.1",
-        help = "Flight SQL Server host"
-    )]
+    #[clap(long, default_value = "127.0.0.1", help = "Flight SQL Server host")]
     host: String,
     #[clap(
         short = 'P',
@@ -36,20 +30,20 @@ struct Args {
     #[clap(long)]
     tls: bool,
 
-    #[clap(long, help = "Print help information")]
-    help: bool,
-
     #[clap(long, default_value = "180", help = "Request timeout in seconds")]
     timeout: u64,
+
+    #[clap(
+        long,
+        default_value = "false",
+        help = "Execute query using prepared statement"
+    )]
+    prepared: bool,
 }
 
 #[tokio::main]
 pub async fn main() -> Result<(), ArrowError> {
     let args = Args::parse();
-    if args.help {
-        print_usage();
-        return Ok(());
-    }
 
     let protocol = if args.tls { "https" } else { "http" };
     // Authenticate
@@ -57,17 +51,13 @@ pub async fn main() -> Result<(), ArrowError> {
     let endpoint = endpoint(&args, url)?;
     let is_repl = atty::is(Stream::Stdin);
     let mut session =
-        session::Session::try_new(endpoint, &args.user, &args.password, is_repl).await?;
+        session::Session::try_new(endpoint, &args.user, &args.password, is_repl, args.prepared)
+            .await?;
 
     session.handle().await;
     Ok(())
 }
 
-fn print_usage() {
-    let msg = r#"Usage: arrow_cli <--user <USER>|--password <PASSWORD>|--host <HOST>|--port <PORT>|--timeout <TIME>>"#;
-    println!("{}", msg);
-}
-
 fn endpoint(args: &Args, addr: String) -> Result<Endpoint, ArrowError> {
     let mut endpoint = Endpoint::new(addr)
         .map_err(|_| ArrowError::IpcError("Cannot create endpoint".to_string()))?
diff --git a/src/session.rs b/src/session.rs
index 0adda4b..a4390fb 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -19,6 +19,7 @@ pub struct Session {
     client: FlightSqlServiceClient<Channel>,
     is_repl: bool,
     prompt: String,
+    prepared: bool,
 }
 
 impl Session {
@@ -27,6 +28,7 @@ impl Session {
         user: &str,
         password: &str,
         is_repl: bool,
+        prepared: bool,
     ) -> Result<Self, ArrowError> {
         let channel = endpoint
             .connect()
@@ -49,6 +51,7 @@ impl Session {
             client,
             is_repl,
             prompt,
+            prepared,
         })
     }
 
@@ -127,8 +130,12 @@ impl Session {
         }
 
         let start = Instant::now();
-        let mut stmt = self.client.prepare(query.to_string(), None).await?;
-        let flight_info = stmt.execute().await?;
+        let flight_info = if self.prepared {
+            let mut stmt = self.client.prepare(query.to_string(), None).await?;
+            stmt.execute().await?
+        } else {
+            self.client.execute(query.to_string(), None).await?
+        };
         let ticket_recv_duration = start.elapsed();
         let mut batches: Vec<RecordBatch> = Vec::new();