diff --git a/Cargo.toml b/Cargo.toml
index 3a0ea451..224a10ed 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["job", "task", "scheduler", "worker", "cron" ]
 edition = "2021"
 
 [features]
-default = ["tracing"]
+default = ["tracing", "tokio-comp"]
 ## Support Tracing 👀
 tracing = ["apalis-core/trace"]
 
diff --git a/README.md b/README.md
index e08f7f85..ecd2874b 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ To get started, just add to Cargo.toml
 
 ```toml
 [dependencies]
-apalis = { version = "0.4", features = ["redis", "tokio-comp"] }
+apalis = { version = "0.4", features = ["redis"] }
 ```
 
 ## Usage
diff --git a/examples/actix-web/Cargo.toml b/examples/actix-web/Cargo.toml
index 3ded4fc0..43093e80 100644
--- a/examples/actix-web/Cargo.toml
+++ b/examples/actix-web/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 anyhow = "1"
-apalis = { path = "../../", features = ["redis", "tokio-comp"] }
+apalis = { path = "../../", features = ["redis"] }
 serde = "1"
 env_logger = "0.10"
 actix-web = "4"
diff --git a/examples/axum/Cargo.toml b/examples/axum/Cargo.toml
index fd0a4def..95a322d1 100644
--- a/examples/axum/Cargo.toml
+++ b/examples/axum/Cargo.toml
@@ -11,6 +11,6 @@ tokio = { version = "1.0", features = ["full"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 serde = { version = "1.0", features = ["derive"] }
-apalis = { path = "../../", features = ["redis", "tokio-comp"] }
+apalis = { path = "../../", features = ["redis"] }
 futures = "0.3"
 email-service = { path = "../email-service" }
\ No newline at end of file
diff --git a/examples/email-service/Cargo.toml b/examples/email-service/Cargo.toml
index 8eeb9129..8ede34ed 100644
--- a/examples/email-service/Cargo.toml
+++ b/examples/email-service/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-apalis = { path = "../../" }
+apalis = { path = "../../", default-features = false }
 futures-util = "0.3.0"
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/examples/mysql/Cargo.toml b/examples/mysql/Cargo.toml
index ee2ba88c..bc34c6be 100644
--- a/examples/mysql/Cargo.toml
+++ b/examples/mysql/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 anyhow = "1"
-apalis = { path = "../../", features = ["mysql", "async-std-comp"] }
+apalis = { path = "../../", features = ["mysql", "async-std-comp", "tracing"], default-features = false }
 serde = "1"
 tracing-subscriber = "0.3.11"
 chrono = { version = "0.4", default-features = false, features = ["clock"] }
diff --git a/examples/postgres/Cargo.toml b/examples/postgres/Cargo.toml
index af0d533e..1cfab53e 100644
--- a/examples/postgres/Cargo.toml
+++ b/examples/postgres/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 anyhow = "1"
-apalis = { path = "../../", features = ["postgres", "tokio-comp"] }
+apalis = { path = "../../", features = ["postgres"] }
 serde = "1"
 tracing-subscriber = "0.3.11"
 chrono = { version = "0.4", default-features = false, features = ["clock"] }
diff --git a/examples/postgres/src/main.rs b/examples/postgres/src/main.rs
index a28f2cea..3a44b327 100644
--- a/examples/postgres/src/main.rs
+++ b/examples/postgres/src/main.rs
@@ -41,7 +41,7 @@ async fn main() -> Result<()> {
                 .layer(TraceLayer::new())
                 .with_storage_config(pg.clone(), |cfg| {
                     cfg
-                        // Set the buffer size to 100
+                        // Set the buffer size to 100 ( Pick 100 jobs per query)
                         .buffer_size(100)
                         // Lower the fetch interval because postgres is waiting for notifications
                         .fetch_interval(Duration::from_secs(1))
diff --git a/examples/prometheus/Cargo.toml b/examples/prometheus/Cargo.toml
index 709c60fd..d3774e4c 100644
--- a/examples/prometheus/Cargo.toml
+++ b/examples/prometheus/Cargo.toml
@@ -11,7 +11,7 @@ tokio = { version = "1.0", features = ["full"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 serde = { version = "1.0", features = ["derive"] }
-apalis = { path = "../../", features = ["redis", "prometheus", "tokio-comp"] }
+apalis = { path = "../../", features = ["redis", "prometheus"] }
 futures = "0.3"
 metrics = "0.18"
 metrics-exporter-prometheus = "0.8"
diff --git a/examples/redis/Cargo.toml b/examples/redis/Cargo.toml
index 2e41942f..d9a971b4 100644
--- a/examples/redis/Cargo.toml
+++ b/examples/redis/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 anyhow = "1"
 tokio = { version ="1", features=["macros", "rt-multi-thread"]}
-apalis = { path = "../../", features = ["redis", "extensions", "tokio-comp"] }
+apalis = { path = "../../", features = ["redis", "extensions"] }
 serde = "1"
 env_logger = "0.10"
 tracing-subscriber = "0.3.11"
diff --git a/examples/rest-api/Cargo.toml b/examples/rest-api/Cargo.toml
index a15f62b8..a6bd2527 100644
--- a/examples/rest-api/Cargo.toml
+++ b/examples/rest-api/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 anyhow = "1"
-apalis = { path = "../../", features = ["redis", "sqlite", "sentry", "postgres", "mysql", "tokio-comp", "expose"] }
+apalis = { path = "../../", features = ["redis", "sqlite", "sentry", "postgres", "mysql", "expose"] }
 serde = "1"
 tokio = { version = "1", features =["macros", "rt-multi-thread"] }
 env_logger = "0.10"
diff --git a/examples/sentry/Cargo.toml b/examples/sentry/Cargo.toml
index 26856923..51794bdd 100644
--- a/examples/sentry/Cargo.toml
+++ b/examples/sentry/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 anyhow = "1"
-apalis = { path = "../../", features = ["redis", "sentry", "tokio-comp"] }
+apalis = { path = "../../", features = ["redis", "sentry"] }
 serde = "1"
 env_logger = "0.10"
 tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
diff --git a/examples/sqlite/Cargo.toml b/examples/sqlite/Cargo.toml
index 43829c7a..bd3f737e 100644
--- a/examples/sqlite/Cargo.toml
+++ b/examples/sqlite/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 anyhow = "1"
 tokio = { version = "1", features=["macros"] }
-apalis = { path = "../../", features = ["sqlite", "limit", "tokio-comp"] }
+apalis = { path = "../../", features = ["sqlite", "limit"] }
 serde = "1"
 tracing-subscriber = "0.3.11"
 chrono = { version = "0.4", default-features = false, features = ["clock"] }
diff --git a/examples/tracing/Cargo.toml b/examples/tracing/Cargo.toml
index 1fca36ab..9c6d8aaf 100644
--- a/examples/tracing/Cargo.toml
+++ b/examples/tracing/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 anyhow = "1"
-apalis = { path = "../../", features = ["redis", "tokio-comp"] }
+apalis = { path = "../../", features = ["redis"] }
 serde = "1"
 tokio = { version ="1", features = ["macros"]}
 env_logger = "0.10"